Cleanup of failed merge