cleanup after merging