old_contents: <<<<<<< HEAD
  from Cython.Shadow import __version__
  =======
  __version__ = "0.17.4"
  >>>>>>> bugs
  
  # Void cython.* directives (for case insensitive operating systems).
  from Cython.Shadow import *
  
new_contents: from Cython.Shadow import __version__
  
  # Void cython.* directives (for case insensitive operating systems).
  from Cython.Shadow import *
  
subject: fix merge conflict