Merge pull request 'OZG-6944-resolve-bean-conflict' (#16) from OZG-6944-resolve-bean-conflict into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/muk-postfach/pulls/16


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>