Cleaning up a merge