Upgrade using ‘make upgrade’, not mergemaster. Why? Well, for one thing, ‘upgrade’ only touches files that you shouldn’t.