cleaned failed merge