restart to original MergeConflict.txt