method string_of_conflict (s1, s2) = "<<<<<<< "^(Filename.basename file)^"\n"^ s1^"=======\n"^ s2^">>>>>>> 1.1\n"