fix: fix merge conflict

Author: seangaaab

.github/workflows/deploy_backend.yml

@@ -64,6 +64,6 @@ jobs:
           if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
           sls deploy --stage prod --verbose
           elif [[ "${{ github.ref }}" == "refs/heads/stage" ]]; then
-          sls deploy --stage staging --verbose
+          sls deploy --stage dev --verbose
           fi
         working-directory: backend

backend/resources/s3.yml

@@ -2,16 +2,19 @@ Resources:
   Bucket:
     Type: AWS::S3::Bucket
     Properties:
-      BucketName: ${self:custom.bucket}
+      BucketName: ${self:custom.bucket}-2
       VersioningConfiguration:
         Status: Enabled
       CorsConfiguration:
         CorsRules:
+          - AllowedHeaders: ["*"]
           - AllowedHeaders: ["*"]
             AllowedMethods: [GET, PUT, HEAD]
             AllowedOrigins: ["*"]
+            AllowedOrigins: ["*"]
             Id: ${self:custom.bucket}-name
             MaxAge: "3600"
+            MaxAge: "3600"
       PublicAccessBlockConfiguration:
         BlockPublicAcls: false
         IgnorePublicAcls: false