fixing merge conflict

Author: paulth1

.openpublishing.redirection.json

@@ -10420,6 +10420,11 @@
             "redirect_url": "/azure/azure-arc/servers/onboard-group-policy-powershell",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-arc/servers/onboard-dsc.md",
+            "redirect_url": "/azure/azure-arc/servers/deployment-options",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-arc/kubernetes/plan-at-scale-deployment.md",
             "redirect_url": "/azure/azure-arc/kubernetes/overview",
@@ -10635,6 +10640,16 @@
             "redirect_url": "/azure/orbital/overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/load-balancer/cross-region-overview.md",
+            "redirect_url": "/azure/reliability/reliability-load-balancer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer/load-balancer-standard-availability-zones.md",
+            "redirect_url": "/azure/reliability/reliability-load-balancer",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/load-balancer/upgrade-basic-standard-virtual-machine-scale-sets.md",
             "redirect_url": "/azure/load-balancer/upgrade-basic-standard-with-powershell",
@@ -10869,12 +10884,16 @@
             "redirect_url": "/azure/azure-health-insights/overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/cloud-services-php-create-web-role.md",
+            "redirect_url": "/azure/cloud-services/cloud-services-php-create-web-role",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/networking/disaster-recovery-dns-traffic-manager.md",
             "redirect_url": "/azure/reliability/reliability-traffic-manager",
             "redirect_document_id": false
         }
-
 
     ]
 }

articles/active-directory-b2c/media/client-credentials-grant-flow/copy-application-secret.png

@@ -13,9 +13,7 @@ metadata:
   ms.author: celested
   ms.service: active-directory
   ms.subservice: azuread-dev
-  ms.workload: identity
   ROBOTS: NOINDEX
-
 landingContent:
   - title: Azure Active Directory for developers
     linkLists: