cleaning up after merges: