Update Deploy.yaml

Author: Ayushmore1214

.github/workflows/Deploy.yaml

@@ -4,19 +4,12 @@ on:
   push:
     branches:
       - main
-<<<<<<< HEAD
     paths-ignore:
       - 'manifests/**'
 
-permissions:
-  id-token: write
-  contents: write
-=======
-
 permissions:
   id-token: write
   contents: read # No longer needs to write back to the repo
->>>>>>> 91607abd30f5719e711a78f161b10833872fb708
 
 jobs:
   build-and-push:
@@ -61,7 +54,6 @@ jobs:
       
       - name: Print New Image Tags
         run: |
-<<<<<<< HEAD
           sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq
           yq -i '.spec.template.spec.containers[0].image = "${{ steps.build-backend.outputs.image }}"' manifests/02-backend.yaml
           yq -i '.spec.template.spec.containers[0].image = "${{ steps.build-frontend.outputs.image }}"' manifests/03-frontend.yaml
@@ -81,9 +73,9 @@ jobs:
             git push
           fi
 
-=======
+
           echo "CI pipeline successful. Images pushed to ECR."
           echo "Please update your Kubernetes manifests with these new image tags:"
           echo "Backend Image: ${{ steps.build-backend.outputs.image }}"
           echo "Frontend Image: ${{ steps.build-frontend.outputs.image }}"
->>>>>>> 91607abd30f5719e711a78f161b10833872fb708
+