BUG: fix in categorical merges
test adapted (at this point kind of loosely) from #28296

- [x] closes #28189
- [x] tests added / passed
- [x] passes `black pandas`
- [x] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
- [x] whatsnew entry
