fix merge conflicts

Author: tamram

.openpublishing.redirection.app-service.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/app-service/security-recommendations.md",
+            "redirect_url": "/security/benchmark/azure/baselines/app-service-security-baseline",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/app-service/scenario-secure-app-authentication-app-service-as-user.md",
             "redirect_url": "/azure/app-service/scenario-secure-app-authentication-app-service",

.openpublishing.redirection.azure-monitor.json

@@ -1807,7 +1807,7 @@
         },
         {
             "source_path_from_root": "/articles/monitoring-and-diagnostics/resource-group-insights.md",
-            "redirect_url": "/azure/azure-monitor/insights/resource-group-insights",
+            "redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",
             "redirect_document_id": true
         },
         {
@@ -6608,6 +6608,11 @@
             "source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
             "redirect_url": "/azure/azure-monitor/overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/insights/resource-group-insights.md",
+            "redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -2290,6 +2290,31 @@
             "redirect_url": "/azure/automation/automation-solution-vm-management",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/automation/automation-solution-vm-management.md",
+            "redirect_url":"/azure/azure-functions/start-stop-vms/overview",
+            "redirect_document_id": false
+        },
+        {
+             "source_path_from_root": "/articles/automation/automation-solution-vm-management-config.md",
+             "redirect_url": "/azure/azure-functions/start-stop-vms/deploy",
+             "redirect_document_id": false
+        },
+        {
+             "source_path_from_root": "/articles/automation/automation-solution-vm-management-logs.md",
+             "redirect_url": "/azure/azure-functions/start-stop-vms/deploy",
+             "redirect_document_id": false
+        },
+        {
+             "source_path_from_root": "/articles/automation/automation-solution-vm-management-remove.md",
+             "redirect_url": "/azure/azure-functions/start-stop-vms/remove",
+             "redirect_document_id": false
+        },
+        {
+             "source_path_from_root": "/articles/automation/troubleshoot/start-stop-vm.md",
+             "redirect_url": "/azure/azure-functions/start-stop-vms/troubleshoot",
+             "redirect_document_id": false
+        },       
         {
             "source_path_from_root": "/articles/update-center/enable-machines.md",
             "redirect_url": "/azure/update-center/updates-maintenance-schedules",

.openpublishing.redirection.sentinel.json

@@ -1054,6 +1054,21 @@
             "source_path_from_root": "/articles/sentinel/process-events-normalization-schema.md",
             "redirect_url": "/azure/sentinel/normalization-schema-process-event",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/notebooks-with-synapse.md",
+            "redirect_url": "/azure/sentinel/notebooks-hunt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/notebooks-with-synapse-export-data.md",
+            "redirect_url": "/azure/sentinel/notebooks-hunt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/notebooks-with-synapse-hunt.md",
+            "redirect_url": "/azure/sentinel/notebooks-hunt",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.virtual-desktop.json

@@ -63,7 +63,7 @@
         {
             "source_path_from_root": "/articles/virtual-desktop/user-documentation/connect-windows-7-10.md",
             "redirect_url": "/azure/virtual-desktop/users/connect-windows",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/virtual-desktop/user-documentation/index.yml",
@@ -374,6 +374,36 @@
             "source_path_from_root": "/articles/virtual-desktop/autoscale-new-existing-host-pool.md",
             "redirect_url": "/azure/virtual-desktop/autoscale-scaling-plan",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/users/connect-windows-azure-virtual-desktop-app.md",
+            "redirect_url": "/azure/virtual-desktop/users/connect-windows",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/users/connect-microsoft-store.md",
+            "redirect_url": "/azure/virtual-desktop/users/connect-windows",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/users/client-features-windows-azure-virtual-desktop-app.md",
+            "redirect_url": "/azure/virtual-desktop/users/client-features-windows",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/users/client-features-microsoft-store.md",
+            "redirect_url": "/azure/virtual-desktop/users/client-features-windows",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/whats-new-client-windows-azure-virtual-desktop-app.md",
+            "redirect_url": "/azure/virtual-desktop/whats-new-client-windows",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/whats-new-client-microsoft-store.md",
+            "redirect_url": "/azure/virtual-desktop/whats-new-client-windows",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory-b2c/TOC.yml

@@ -547,6 +547,9 @@
             href: partner-whoiam.md
           - name: xID
             href: partner-xid.md
+      - name: Enable CAPTCHA
+        href: add-captcha.md
+        displayName: Completely Automated Public Turing Tests to Tell Computer and Human Apart, HIP, Human Interactive Proofs 
       - name: Web Application Firewall partners
         items:
         - name: Akamai
@@ -714,6 +717,8 @@
           href: display-control-verification.md
         - name: Time-based one-time password (TOTP)
           href: display-control-time-based-one-time-password.md
+        - name: CAPTCHA verification
+          href: display-control-captcha.md
     - name: ClaimsProviders
       href: claimsproviders.md
       items:
@@ -761,6 +766,9 @@
         - name: SSO session
           href: custom-policy-reference-sso.md
           displayName: single sign-on
+        - name: CAPTCHA
+          href: captcha-technical-profile.md
+          displayName: CAPTCHA challenge, Completely Automated Public Turing Tests to Tell Computer and Human Apart
     - name: UserJourneys
       href: userjourneys.md
     - name: SubJourneys