solved some merge conflicts #15542

Job	Run time
branch_meta	2s
build_and_push	3m 33s
trivy-vulnerability-scanning	58s
end-to-end-tests / e2e (courses_and_topics)	4m 37s
end-to-end-tests / e2e (management)	7m 31s
end-to-end-tests / e2e (navi_user_settings)	7m 51s
deploy / create_artifacts_repos (schulcloud-server)	35s
deploy / create_artifacts_repos (schulcloud-client)	17s
end-to-end-tests / e2e (tasks_and_other)	5m 37s
deploy / create_artifacts_repos (nuxt-client)	20s
deploy / create_artifacts_repos (superhero-dashboard)	4s
deploy / create_artifacts_repos (schulcloud-calendar)	5s
deploy / create_artifacts_repos (antivirus_check_service)	7s
deploy / create_artifacts_repos (version-aggregator)	3s
deploy / create_artifacts_repos (dof_app_deploy)	6s
deploy / create_artifacts_repos (h5p-staticfiles-server)	3s
deploy / create_branch_identifier / convert_branch_name	1s
deploy / create_artifacts_workspaces (brb)	3s
deploy / create_artifacts_workspaces (default)	3s
deploy / create_artifacts_workspaces (nbc)	2s
deploy / create_artifacts_workspaces (thr)	3s
deploy / bingo_add_branch / get_values_insert_branch_if_not_existent	3s
deploy / deploy_nbc_dev / deploy nbc	4m 56s
deploy / deploy_brb_dev / deploy brb	4m 14s
deploy / deploy_dbc_dev / deploy dbc	7m 33s
test-successful	1s
cy-e2e-tests	0s
deploy-successful	0s
	48m 48s

Provide feedback