delete conflict markers.