# Conflicts: # core-plugin-openbis/settings.gradle # ui-admin/src/js/common/messages.js # ui-admin/src/js/components/common/form/Button.jsx # ui-admin/src/js/components/database/DatabaseComponent.jsx