This level appeared to function incorrectly; the hint seemed to imply…

… that the merged file should

contain the 'correct' version of the poem and nothing else, but it required the phrase 'cool poem' be
in the file. Updated to refuse anything but the 'correct' poem.

levels/conflict.rb

@@ -13,11 +13,11 @@
 
   txt = `cat poem.txt`
   solved = false if txt =~ /[<>=]/
-  solved = false unless txt =~ /cool poem/
+  solved = false if txt =~ /cool poem/
 
   solved
 end
 
 hint do
-  puts ["First you have to do a merge. Then resolve any conflicts and finish the merge", "Take a look at the sections on merge conflicts in 'git merge'.", "Remove the unnecessary lines in poem.txt."]
+  puts ["First you have to do a merge. Then resolve any conflicts and finish the merge", "Take a look at the sections on merge conflicts in 'git merge'.", "Remove the unnecessary lines in poem.txt, leaving the correct version of the poem."]
 end