old_contents: #!/usr/bin/env python
  
  import os
  import sys
  
  print("Hello, World!")
  print os.environ["USER"]
  <<<<<<< HEAD
  print sys.prefix
  =======
  print os.environ["HOME"]
  
  x = 1
  y = 2
  
  print x + y
  >>>>>>> master
  
  a = [ 1, 2, 3 ]
  print a[1]
  
  print("Lets make this messy!!!")
  
new_contents: #!/usr/bin/env python
  
  import os
  import sys
  
  print("Hello, World!")
  
  print os.environ["USER"]
  print os.environ["HOME"]
  
  print sys.prefix
  
  x = 1
  y = 2
  
  print x + y
  
  a = [ 1, 2, 3 ]
  print a[1]
  
  print("Lets make this messy!!!")
  
subject: clean up