update the file merge.txt
merge the conflict in the file:merge.txt