Manual merge clean-up