fixing failed merge