-correct the failed merge