Fixing some accidentally committed merge conflict markers.