Fix screwup with merge