Deleted last line in mergeconflict.txt