More failed merge fix