make mergeconflict.txt look like the original again.