correct failed merge