old_contents: """The point of this exercise is to create a merging conflict.
  Accomplish this by deleting the line containing the if statement
  above your name. Only modify the one if statement with your name"""
  
  
  ##  BEFORE
  ##  if("name"):
  ##     print "name"
  ##
  ##  AFTER
  ##  print "name"
  
  
  def print_name():
      
      if("Timothy"):
          print "Timothy"
          
      if("Chris W."):
          print "Chris W."
          
      if("Sean"):
          print "Sean"
          
          print "Chris R."
          
      if("Bryan"):
          print "Bryan"
          
      print "Matthew"
          
      if("Dustin"):
          print "Dustin"
  
      if("Darron"):
          print "Darron"
          
  
new_contents: """The point of this exercise is to create a merging conflict.
  Accomplish this by deleting the line containing the if statement
  above your name. Only modify the one if statement with your name"""
  
  
  ##  BEFORE
  ##  if("name"):
  ##     print "name"
  ##
  ##  AFTER
  ##  print "name"
  
  
  def print_name():
      
      if("Timothy"):
          print "Timothy"
          
      if("Chris W."):
          print "Chris W."
          
          print "Sean"
          
          print "Chris R."
          
      if("Bryan"):
          print "Bryan"
          
      print "Matthew"
          
      if("Dustin"):
          print "Dustin"
  
      if("Darron"):
          print "Darron"
          
  
subject: Test Commint; please ignore