Removes conflict markers.