Bad merge fix