Fixing failed merge