clean up failed merge