From eccec599d70aed758d866d5472568c73d86528ae Mon Sep 17 00:00:00 2001
From: Calvin Combs <comcalvi@amazon.com>
Date: Mon, 30 Sep 2024 14:58:58 -0700
Subject: [PATCH] conflcits

---
 packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
index a512fbd6b4cb9..04b533b0862b6 100644
--- a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
+++ b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
@@ -142,12 +142,9 @@ The following json shows the current recommended set of flags, as `cdk init` wou
     "@aws-cdk/aws-s3:keepNotificationInImportedBucket": false,
     "@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": true,
     "@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": true,
-<<<<<<< HEAD
+    "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true,
+    "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": true,
     "@aws-cdk/core:cfnIncludeRejectComplexResourceUpdateCreatePolicyIntrinsics": true
-=======
-    "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true
-    "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": true
->>>>>>> b0e4a544aecce86e8b41e7cd148a139c2e34bfbd
   }
 }
 ```