BUG: merging with a boolean/int categorical column
Additional check prevents trying to change types of categorical blocks.

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