add MergeConflict.txt