fixed failed merge