Fix failed merge