diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a39203b..45afe6e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -91,8 +91,4 @@ jobs:
 
       - name: Deploy Application
         run: |
-<<<<<<< HEAD
           azd deploy --environment ${{ env.AZURE_ENV_NAME }} --no-prompt
-=======
-          azd deploy --environment ${{ env.AZURE_ENV_NAME }} --no-prompt
->>>>>>> de8f2ba6d937d18222da9bfd1fac662adeb0e64e