Clean up stray conflict markers.