remove MergeConflict.txt