Cleaning up after failed merge