aws-samples
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎lib/rds-snapshot-export-pipeline-stack.ts
-6 b/‎lib/rds-snapshot-export-pipeline-stack.ts
-6
@@ -5,3 +5,4 @@ node_modules
 # CDK asset staging directory
 .cdk.staging
 cdk.out
+.DS_Store
@@ -193,13 +193,7 @@ export class RdsSnapshotExportPipelineStack extends Stack {
             "Effect": "Allow"
           },
           {
-<<<<<<< HEAD
-            "Principal": {
-              "AWS": lambdaExecutionRole.roleArn
-            },
-=======
             "Principal": { "AWS": lambdaExecutionRole.roleArn },
->>>>>>> upstream/master
             "Action": [
               "kms:CreateGrant",
               "kms:ListGrants",