Merge pull request 'OZG-6162-resolve-bean-conflict' (#5) from OZG-6162-resolve-bean-conflict into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/document-manager/pulls/5


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