Bad merge fixed