fixing merge conflict

Author: paulth1

.openpublishing.publish.config.json

@@ -32,6 +32,12 @@
   "need_preview_pull_request": true,
   "contribution_branch_mappings": {},
   "dependent_repositories": [
+    {
+      "path_to_root": "azure-docs-snippets-pr",
+      "url": "https://github.com/MicrosoftDocs/azure-docs-snippets-pr",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-dev-docs-pr",
       "url": "https://github.com/MicrosoftDocs/azure-dev-docs-pr",
@@ -928,7 +934,7 @@
     ".openpublishing.redirection.active-directory.json",
     ".openpublishing.redirection.api-management.json",
     ".openpublishing.redirection.azure-attestation.json",
-    ".openpublishing.redirection.azure-blob.json",
+    ".openpublishing.redirection.storage.json",
     "articles/data-factory/.openpublishing.redirection.data-factory.json",
     ".openpublishing.redirection.defender-for-cloud.json",
     ".openpublishing.redirection.defender-for-iot.json",
@@ -992,6 +998,7 @@
     ".openpublishing.redirection.baremetal-infrastructure.json",
     "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
     "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
-    ".openpublishing.redirection.azure-vmware.json"
+    ".openpublishing.redirection.azure-vmware.json",
+    ".openpublishing.redirection.openshift.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path_from_root": "/articles/active-directory/develop/active-directory-claims-mapping.md",
+      "redirect_url": "/azure/active-directory/develop/active-directory-saml-claims-customization",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/configure-token-lifetimes.md",
+      "redirect_url": "/azure/active-directory/develop/active-directory-saml-claims-customization",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/authentication/how-to-mfa-microsoft-managed.md",
       "redirect_url": "/azure/active-directory/authentication/concept-authentication-default-enablement",
@@ -50,6 +60,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/firstbird-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/radancys-employee-referrals-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -11040,6 +11055,16 @@
       "source_path_from_root": "/articles/active-directory/develop/microsoft-graph-intro.md",
       "redirect_url": "/graph/overview?toc=/azure/active-directory/develop/toc.json&bc=/azure/active-directory/develop/breadcrumb/toc.json",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/privileged-identity-management/concept-privileged-access-versus-role-assignable.md",
+      "redirect_url": "azure/active-directory/privileged-identity-management/concept-pim-for-groups",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/privileged-identity-management/groups-features.md",
+      "redirect_url": "azure/active-directory/privileged-identity-management/concept-pim-for-groups",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.azure-blob.json

@@ -3787,14 +3787,19 @@
             "redirect_url": "/azure/azure-monitor/alerts/alerts-classic-portal",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/platform/alerts-common-schema-definitions.md",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-common-schema",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/alerts-common-schema.md",
             "redirect_url": "/azure/azure-monitor/alerts/alerts-common-schema",
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/azure-monitor/platform/alerts-common-schema-definitions.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-common-schema-definitions",
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-common-schema-definitions.md",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-common-schema",
             "redirect_document_id": false
         },
         {
@@ -5661,6 +5666,21 @@
             "source_path_from_root": "/articles/azure-monitor/vm/monitor-virtual-machine-workloads.md",
             "redirect_url": "/azure/azure-monitor/vm/monitor-virtual-machine-data-collection",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/azure-data-explorer-monitor-cross-service-query.md",
+            "redirect_url": "/azure/azure-monitor/logs/azure-monitor-data-explorer-proxy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/mobile-center-quickstart.md",
+            "redirect_url": "https://github.com/Microsoft/appcenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/windows-desktop.md",
+            "redirect_url": "https://github.com/Microsoft/appcenter",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -89,6 +89,11 @@
       "source_path": "articles/lab-services/how-to-enable-nested-virtualization-template-vm.md",
       "redirect_url": "/azure/lab-services/concept-nested-virtualization-template-vm",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/troubleshoot.md",
+      "redirect_url": "/azure/lab-services/troubleshoot-lab-creation",
+      "redirect_document_id": true
     }
   ]
 }

.openpublishing.redirection.azure-productivity.json

@@ -654,6 +654,11 @@
             "redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-connect-sensor-by-proxy.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/connect-sensors",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/references-defender-for-iot-glossary.md",
             "redirect_url": "/azure/defender-for-iot/organizations/overview",