Merge pull request #594 from microsoft/prdc-conflict-resolve

chore: resolved conflicts

Author: Prajwal-Microsoft

docs/images/readme/approach.png

@@ -1237,7 +1237,6 @@ module avmCosmosDB 'br/public:avm/res/document-db/database-account:0.19.0' = {
     capabilitiesToAdd: [
       'EnableMongo'
     ]
-    enableAnalyticalStorage: true
     defaultConsistencyLevel: 'Session'
     maxIntervalInSeconds: 5
     maxStalenessPrefix: 100

docs/images/readme/processing-pipeline.png

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.42.1.51946",
-      "templateHash": "312988678863218513"
+      "templateHash": "12078312041649297460"
     },
     "name": "Content Processing Solution Accelerator",
     "description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -42481,10 +42481,10 @@
       },
       "dependsOn": [
         "avmAiServices",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
         "virtualNetwork"
       ]
     },
@@ -50787,9 +50787,6 @@
               "EnableMongo"
             ]
           },
-          "enableAnalyticalStorage": {
-            "value": true
-          },
           "defaultConsistencyLevel": {
             "value": "Session"
           },