Merge clean-up