deleted last line of MergeConflict.txt