diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 55b4282..22031ce 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,7 +14,10 @@ variables:
   containerRegistry: 'voloeventhub.azurecr.io'
   dockerfilePath: '**/Dockerfile'
   tag: '$(Build.BuildNumber)'
+<<<<<<< HEAD
+=======
 
+>>>>>>> main
 
   # Agent VM image name
   vmImageName: 'ubuntu-latest'