Fix merge conflicts

Author: RoseHJM

.openpublishing.publish.config.json

@@ -986,6 +986,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-nosql-dotnet-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-nosql-javascript-samples",
       "url": "https://github.com/azure-samples/cosmos-db-nosql-javascript-samples",

.openpublishing.redirection.active-directory.json

@@ -24,6 +24,11 @@
             "source_path_from_root": "/articles/aks/create-k8s-cluster-with-aks-application-gateway-ingress.md",
             "redirect_url": "/azure/application-gateway/for-containers/overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/aks/out-of-tree.md",
+            "redirect_url": "/azure/aks",
+            "redirect_document_id": false
         }
     ]
-}
+}

.openpublishing.redirection.azure-kubernetes-service.json

@@ -6398,6 +6398,21 @@
             "source_path_from_root": "/articles/azure-monitor/app/data-retention-privacy.md",
             "redirect_url": "/azure/azure-monitor/app/app-insights-overview#how-does-application-insights-handle-data-collection-retention-storage-and-privacy",
             "redirect_document_id": false
-        }
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/metrics-getting-started.md",
+            "redirect_url": "/azure/azure-monitor/essentials/analyze-metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/metrics-dynamic-scope.md",
+            "redirect_url": "/azure/azure-monitor/essentials/analyze-metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/metrics-charts.md",
+            "redirect_url": "/azure/azure-monitor/essentials/analyze-metrics",
+            "redirect_document_id": false
+        } 
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -1,5 +1,140 @@
 {
     "redirections": [
+    {
+      "source_path": "articles/active-directory/azuread-dev/about-microsoft-identity-platform.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/about-microsoft-identity-platform",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/active-directory-acs-migration.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/active-directory-acs-migration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/active-directory-authentication-libraries.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/active-directory-authentication-libraries",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/active-directory-devhowto-adal-error-handling.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/active-directory-devhowto-adal-error-handling",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/app-types.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/app-types",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/azure-ad-endpoint-comparison.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/azure-ad-federation-metadata.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/azure-ad-federation-metadata",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/conditional-access-dev-guide.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/conditional-access-dev-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/howto-get-appsource-certified.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/howto-get-appsource-certified",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/howto-reactivate-disabled-acs-namespaces.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/howto-reactivate-disabled-acs-namespaces",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/howto-v1-enable-sso-android.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/howto-v1-enable-sso-android",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/howto-v1-enable-sso-ios.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/howto-v1-enable-sso-ios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/native-app.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/native-app",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/sample-v1-code.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/sample-v1-code",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/service-to-service.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/service-to-service",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/single-page-application.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/single-page-application",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/v1-authentication-scenarios.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/v1-authentication-scenarios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/v1-oauth2-client-creds-grant-flow.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/v1-oauth2-client-creds-grant-flow",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/v1-oauth2-implicit-grant-flow.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/v1-oauth2-implicit-grant-flow",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/v1-oauth2-on-behalf-of-flow.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/v1-oauth2-on-behalf-of-flow",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/v1-overview.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/v1-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/v1-permissions-consent.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/v1-permissions-consent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/v1-protocols-oauth-code.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/v1-protocols-oauth-code",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/v1-protocols-openid-connect-code.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/v1-protocols-openid-connect-code",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/videos.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/videos",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/web-api.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/web-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/azuread-dev/web-app.md",
+      "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/web-app",
+      "redirect_document_id": false
+    },
 	{
             "source_path": "articles/communication-services/tutorials/file-sharing-tutorial.md",
             "redirect_URL": "/azure/communication-services/tutorials/file-sharing-tutorial-acs-chat",
@@ -7793,6 +7928,26 @@
             "redirect_url": "/azure/azure-arc/vmware-vsphere/setup-and-manage-self-service-access",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-arc/vmware-vsphere/azure-arc-resource-bridge.md",
+            "redirect_url": "/azure/azure-arc/vmware-vsphere/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-arc/vmware-vsphere/custom-locations.md",
+            "redirect_url": "/azure/azure-arc/vmware-vsphere/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-arc/system-center-virtual-machine-manager/azure-arc-resource-bridge.md",
+            "redirect_url": "/azure/azure-arc/system-center-virtual-machine-manager/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-arc/system-center-virtual-machine-manager/custom-locations.md",
+            "redirect_url": "/azure/azure-arc/system-center-virtual-machine-manager/overview",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-arc/vmware-vsphere/manage-vmware-vms-in-azure.md",
             "redirect_url": "/azure/azure-arc/vmware-vsphere/perform-vm-ops-through-azure",
@@ -9202,6 +9357,11 @@
             "redirect_url": "/azure/azure-vmware/configure-site-to-site-vpn-gateway",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-multi-site-to-site-resource-manager-portal.md",
+            "redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-openvpn-clients.md",
             "redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
@@ -9216,7 +9376,7 @@
          "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-forced-tunneling-rm.md",
          "redirect_url": "/azure/vpn-gateway/about-site-to-site-tunneling",
          "redirect_document_id": false
-     },
+        },
         {
             "source_path_from_root": "/articles/azure-vmware/public-ip-usage.md",
             "redirect_url": "/azure/azure-vmware/enable-public-ip-nsx-edge",
@@ -24343,7 +24503,17 @@
         },
         {
             "source_path_from_root": "/articles/operator-nexus/template-virtualized-network-function-deployment.md",
-            "redirect_url": "/azure/operator-nexus/quickstarts-tenant-workload-deployment",
+            "redirect_url": "/azure/operator-nexus/quickstarts-virtual-machine-deployment-cli",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/operator-nexus/quickstarts-tenant-workload-deployment.md",
+            "redirect_url": "/azure/operator-nexus/quickstarts-virtual-machine-deployment-cli",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/operator-nexus/quickstarts-tenant-workload-deployment-ps.md",
+            "redirect_url": "/azure/operator-nexus/quickstarts-virtual-machine-deployment-ps",
             "redirect_document_id": false
         },
         {
@@ -24491,6 +24661,11 @@
             "redirect_url": "/azure/load-balancer/upgrade-basic-standard-with-powershell",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/spring-apps/how-to-enable-redundancy-and-disaster-recovery.md",
+            "redirect_url": "/azure/reliability/reliability-spring-apps",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/update-center/assessment-options.md",
             "redirect_url": "/azure/update-manager/assessment-options",
@@ -24655,6 +24830,11 @@
             "source_path": "articles/update-center/workbooks.md",
             "redirect_url": "/azure/update-manager/workbooks",
             "redirect_document_id": false
-        }
+        },
+        {
+            "source_path_from_root": "/articles/orbital/delete-contact.md",
+	    "redirect_url": "/azure/orbital/spacecraft-object",
+            "redirect_document_id": false
+        },
     ]
 }