Delete mergeconflict.txt