fix failed merge