3rd try question 1.4 removed last line of MergeConflict.txt