Original MergeConflict.txt