failed merge fixed