Update MergeConflict.txt