post-merge clean-up