SPSH-664: fix merge conflicts #5403

Job	Run time
create_branch_identifier_for_deletion	0s
Scheduled trivy scan of latest image	0s
CodeQL / Analyze CodeQL	1m 46s
branch_meta / branch_meta	1s
Linting / Nest Lint	1m 18s
scan_helm / Kics Helm Chart Scan	25s
Tests and Sonarcloud / Tests and Sonarcloud	12m 15s
delete_namespace	0s
delete_successful	0s
create_branch_identifier / convert_branch_name	1s
select_helm_version_generation_and_image_tag_generation	1s
release_helm / release	21s
Publish image and scan with trivy / Publish image	1m 45s
Publish image and scan with trivy / pre_scan	1s
Publish image and scan with trivy / Trivy scan for uploaded image / Trivy Scan	33s
deploy / create_dbildungs_iam_server_db_name	1s
deploy / determine_playwright_branch	3s
deploy / create_dbildungs_iam_keycloak_db_name	1s
deploy / find_dbildungs_iam_server_helm_chart_tag / search_for_helm_tagname	3s
deploy / find_dbildungs_iam_ldap_helm_chart_tag / search_for_helm_tagname	14s
deploy / find_dbildungs_iam_keycloak_helm_chart_tag / search_for_helm_tagname	16s
deploy / find_schulportal_client_helm_chart_tag / search_for_helm_tagname	12s
deploy / create_ingress_prefix / branch_meta	1s
deploy / create_lowercase_ingress_prefix / convert_branch_name	1s
deploy / deployment	6m 18s
deploy / run_playwright_tests / run_playwright_end2end_tests	4m 55s
	30m 32s

Provide feedback