Remove stray 'merge conflict' notation.