clean up after another merge