diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 4026eee..b8072a2 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -44,10 +44,10 @@ jobs:
       - name: Upload to AWS S3
         run: |
           aws deploy push \
-            --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} \
-            --ignore-hidden-files \
-            --s3-location s3://$AWS_S3_BUCKET/cicd/$GITHUB_SHA.zip \
-            --source .
+          --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} \
+          --ignore-hidden-files \
+          --s3-location s3://$AWS_S3_BUCKET/cicd/$GITHUB_SHA.zip \
+          --source .
       #업로드된 ZIP 파일을 CodeDeploy로 배포
       - name: AWS Code Deploy
         run: |
@@ -55,8 +55,4 @@ jobs:
           --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} \
           --deployment-config-name CodeDeployDefault.AllAtOnce \
           --deployment-group-name ${{ env.AWS_CODE_DEPLOY_GROUP }} \
-<<<<<<< HEAD
-          --s3-location bucket=$AWS_S3_BUCKET,bundleType=zip,key=cicd/$GITHUB_SHA.zip
-=======
           --s3-location bucket=$AWS_S3_BUCKET,bundleType=zip,key=cicd/$GITHUB_SHA.zip
->>>>>>> 0c4b8e1f2918633c06af838b69fb6340000aa432