Manually fix merge