Remove conflict markers.