fixed merge conflict

Author: MGoedtel

.openpublishing.redirection.active-directory.json

@@ -50,6 +50,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",
@@ -11035,6 +11040,11 @@
       "source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-playbook.md",
       "redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-user-guide",
       "redirect_document_id": false
+    },
+    {
+      "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
     }
   ]
 }

.openpublishing.redirection.healthcare-apis.json

@@ -489,37 +489,37 @@
     },
     {
         "source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-azure-resource-manager-template-quickstart.md",
-        "redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
+        "redirect_url": "/azure/healthcare-apis/iot/overview",
         "redirect_document_id": false
     },
     {
         "source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-data-flow.md",
-        "redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
+        "redirect_url": "/azure/healthcare-apis/iot/overview",
         "redirect_document_id": false
     },
     {
         "source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-fhir-portal-quickstart.md",
-        "redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
+        "redirect_url": "/azure/healthcare-apis/iot/overview",
         "redirect_document_id": false
     },
     {
         "source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-mapping-templates.md",
-        "redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
+        "redirect_url": "/azure/healthcare-apis/iot/overview",
         "redirect_document_id": false
     },
     {
         "source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-metrics-diagnostics-export.md",
-        "redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
+        "redirect_url": "/azure/healthcare-apis/iot/overview",
         "redirect_document_id": false
     },
     {
         "source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-metrics-display.md",
-        "redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
+        "redirect_url": "/azure/healthcare-apis/iot/overview",
         "redirect_document_id": false
     },
     {
         "source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-troubleshoot-guide.md",
-        "redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
+        "redirect_url": "/azure/healthcare-apis/iot/overview",
         "redirect_document_id": false
     },
     {
@@ -645,6 +645,10 @@
         "redirect_url": "/azure/healthcare-apis/iot/troubleshoot-errors",
         "redirect_document_id": false
     },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/device-data-through-iot-hub.md",
+        "redirect_url": "/azure/healthcare-apis/iot/device-messages-through-iot-hub",
+        "redirect_document_id": false
+    },
     {   "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
         "redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
         "redirect_document_id": false

.openpublishing.redirection.json

@@ -16299,6 +16299,11 @@
             "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
             "redirect_document_id": ""
         },
+        {
+            "source_path_from_root": "/articles/search/search-get-started-vs-code.md",
+            "redirect_url": "/previous-versions/azure/search/search-get-started-vs-code",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/search/search-how-to-index-power-query-data-sources.md",
             "redirect_url": "/previous-versions/azure/search/search-how-to-index-power-query-data-sources",

articles/active-directory-b2c/TOC.yml

@@ -35,7 +35,7 @@
   # - name: 4 - Create custom policies
     # Create this file (tutorial-create-custom-policies.md), and content into it. You also need to update the index.yml's card, Customize, to reflect the new file name
     # What keywords users are searching in TOC: https://review.docs.microsoft.com/en-us/help/contribute/kusto/samples/discoverability-toc-filter?branch=main 
-    # href: tutorial-create-user-flows.md
+    # href:tutorial-create-user-flows.md
   - name: 4 - Manage your tenant
     href: tenant-management.md
     displayName: break glass account, emergence account
@@ -106,6 +106,7 @@
       href: user-flow-overview.md
     - name: Custom policy overview
       href: custom-policy-overview.md
+      displayName: extend, extensibility
   - name: API Connectors
     href: api-connectors-overview.md
     displayName: REST API, web API, API connectors, Dynamic data retrieval, external data sources, external identity data source, outbound webhooks, third-party integration
@@ -461,7 +462,8 @@
     - name: Integrate with our technology partners
       items:
       - name: Azure AD B2C partner gallery
-        href: partner-gallery.md      
+        href: partner-gallery.md     
+        displayName: marketplace, integration, extensibility, extend, customization, customisation
     # Secure
   - name: Secure
     items: