Removed some accidentally committed conflict markers