feat(chore): resolve merge conflict #149

Job	Run time
Setup Deployment	2s
Validate permissions	3s
Build Web-PDF Microservice / Build & Push Java 11 Image	1m 30s
Build Backend Microservice / Build & Push Java 17 Image	2m 6s
Build Frontend Microservice / build	4m 45s
Build User-Auditor Microservice / Build & Push Java 11 Image	1m 43s
Check Go Dependencies	0s
Build UTMStack Collector	58s
Build Event Processor Microservice	3m 22s
Build and Sign Agent	1m 41s
Build Agent Manager Microservice	1m 45s
All Builds Complete	3s
Deploy Installer (Dev) / Deploy V11 to Dev Runner	7s
Publish New Version to Customer Manager	8s
Generate Changelog	0s
Deploy Installer (Dev) / Build V11 Installer for Prerelease	0s
Deploy Installer (Dev) / Upload V10 Installer to Prerelease	-1s
Deploy Installer (Dev) / Deploy V10 to RC Runner	-1s
Deploy Installer (Dev) / Deploy V10 to Dev Runner	-1s
Build & Upload Installer (RC)	-1s
Schedule release to our instances	2s
	18m 11s

Provide feedback