fixed merge conflict

Author: bandersmsft

.openpublishing.publish.config.json

@@ -356,6 +356,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-functions-python-worker",
+      "url": "https://github.com/Azure/azure-functions-python-worker",
+      "branch": "dev",
+      "branch_mapping": {}
+    },    
     {
       "path_to_root": "functions-openapi-turbine-repair",
       "url": "https://github.com/Azure-Samples/functions-openapi-turbine-repair",

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

@@ -351,12 +351,6 @@
             "redirect_url": "/cli/azure/aks#az_aks_create",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/aks/delete-cluster.md",
-            "redirect_url": "/cli/azure/aks#az_aks_delete",
-            "redirect_document_id": false
-        },
-
         {
             "source_path": "articles/aks/view-master-logs.md",
             "redirect_url": "/azure/aks/view-control-plane-logs",

.openpublishing.redirection.defender-for-cloud.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/secret-scanning.md",
+            "redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/prevent-misconfigurations.md",
             "redirect_url": "/azure/defender-for-cloud/manage-mcsb",

.openpublishing.redirection.json

@@ -3987,7 +3987,7 @@
         },
         {
             "source_path_from_root":"/articles/trusted-signing/concept.md",
-            "redirect_url":"/azure/trusted-signing/concept-trustedsigning-resources-roles",
+            "redirect_url":"/azure/trusted-signing/concept-trusted-signing-resources-roles",
             "redirect_document_id":false 
         },
         {