Merge pull request #4283 from systeminit/zack/remove-conflicts-ignore… #157

Job	Run time
deploy-tools-prod / define-deployment-matrix	1s
deploy-tools-prod / set-init / Set init version	5s
deploy-tools-prod / deploy-services (rebaser) / Deploy Service	5m 36s
deploy-tools-prod / deploy-services (veritech) / Deploy Service	7m 0s
deploy-tools-prod / deploy-services (pinga) / Deploy Service	5m 38s
deploy-tools-prod / deploy-services (sdf) / Deploy Service	9m 1s
deploy-tools-prod / deploy-services (web) / Deploy Service	1m 49s
deploy-tools-prod / e2e-validation / define-test-matrix	8s
deploy-tools-prod / e2e-validation / sdf-healthcheck	8s
deploy-tools-prod / e2e-validation / cypress-tests (archive)	1m 29s
deploy-tools-prod / e2e-validation / cypress-tests (workspace-management)	1m 45s
deploy-tools-prod / e2e-validation / cypress-tests (module-index)	1m 24s
deploy-tools-prod / e2e-validation / cypress-tests (web-functionality)	2m 41s
deploy-tools-prod / e2e-validation / cypress-tests (modelling-functionality)	3m 13s
deploy-tools-prod / e2e-validation / cypress-tests (authentication)	1m 54s
deploy-tools-prod / e2e-validation / on-failure	2s
	41m 54s

Provide feedback