Clean up after merging