merge-ort: clean up after failed merge