Add mergeconflict.txt