Resolve merge conflicts in main.json

Author: Prachig-Microsoft

infra/main.json

@@ -5,13 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-<<<<<<< HEAD
       "version": "0.42.1.51946",
       "templateHash": "6983410399801343370"
-=======
-      "version": "0.41.2.15936",
-      "templateHash": "10582002328170601028"
->>>>>>> 3d11d137defe9941ffb37b28b42c5c4c4c24d2df
     }
   },
   "parameters": {
@@ -4685,13 +4680,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-<<<<<<< HEAD
               "version": "0.42.1.51946",
               "templateHash": "2245351167779444314"
-=======
-              "version": "0.41.2.15936",
-              "templateHash": "10681183203421948888"
->>>>>>> 3d11d137defe9941ffb37b28b42c5c4c4c24d2df
             }
           },
           "definitions": {
@@ -30060,13 +30050,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-<<<<<<< HEAD
               "version": "0.42.1.51946",
               "templateHash": "16866311185741009453"
-=======
-              "version": "0.41.2.15936",
-              "templateHash": "8365054813170845685"
->>>>>>> 3d11d137defe9941ffb37b28b42c5c4c4c24d2df
             }
           },
           "definitions": {
@@ -33802,13 +33787,8 @@
         }
       },
       "dependsOn": [
-<<<<<<< HEAD
         "appIdentity",
-=======
         "aiFoundryAiServices",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
->>>>>>> 3d11d137defe9941ffb37b28b42c5c4c4c24d2df
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",