Remove stray conflict marker.