fix: Dev Main Conflict fix (#2186) #175

Job	Run time
Validate Input Parameters	4s
Run / deploy / azure-setup	19s
Run / deploy / Deploy on Linux / deploy-linux	34m 54s
Run / deploy / Deploy on Windows	0s
Run / deploy / post-deployment-setup / post-deployment-setup	18m 58s
Run / deploy / import-sample-data-postgresql	0s
Run / deploy / import-sample-data-cosmosdb	0s
Run / e2e-test	0s
Run / cleanup-deployment / cleanup-deployment	12s
Run / send-notification / send-notification	3s
	54m 30s

Provide feedback