Revert "add the categories, do not replace them, at merge time"

This reverts commit b1ec50f07b0e5f0eda95130db727cd4550e5d54f.
Merge remote-tracking branch 'origin/1.12'