Remove conflict marker.