fix merge conflict

Author: ggailey777

.openpublishing.publish.config.json

@@ -896,6 +896,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "storage-mgmt-devguide-dotnet",
+      "url": "https://github.com/Azure-Samples/storage-mgmt-devguide-dotnet",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-sdk-for-net",
       "url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -986,6 +992,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-fastapi-postgresql-sample-app",
+      "url": "https://github.com/Azure-Samples/msdocs-fastapi-postgresql-sample-app",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "msdocs-quarkus-postgresql-sample-app",
       "url": "https://github.com/Azure-Samples/msdocs-quarkus-postgresql-sample-app",
@@ -1277,7 +1289,6 @@
   ".openpublishing.redirection.azure-databricks.json",
   ".openpublishing.redirection.azure-datalake-storage-gen1.json",
   ".openpublishing.redirection.azure-hpc.json",
-  ".openpublishing.redirection.azure-kubernetes-service.json",
   ".openpublishing.redirection.azure-monitor.json",
   ".openpublishing.redirection.azure-percept.json",
   ".openpublishing.redirection.azure-productivity.json",
@@ -1294,6 +1305,7 @@
   ".openpublishing.redirection.defender-for-iot.json",
   ".openpublishing.redirection.dev-spaces.json",
   ".openpublishing.redirection.devops-project.json",
+  ".openpublishing.redirection.dms.json",
   ".openpublishing.redirection.document-db.json",
   ".openpublishing.redirection.germany.json",
   ".openpublishing.redirection.government.json",
@@ -1324,7 +1336,6 @@
   "articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
   "articles/ai-services.openpublishing.redirection.ai-services.json",
   "articles/ai-studio/.openpublishing.redirection.ai-studio.json",
-  "articles/aks/.openpublishing.redirection.aks.json",
   "articles/analysis-services/.openpublishing.redirection.analysis-services.json",
   "articles/application-gateway/.openpublishing.redirection.application-gateway.json",
   "articles/automation/.openpublishing.redirection.automation.json",

.openpublishing.redirection.api-management.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+        "source_path": "articles/api-management/api-management-in-workspace.md",
+        "redirect_url": "/azure/api-management/how-to-create-workspace",
+        "redirect_document_id": false
+      },     
       {
         "source_path": "articles/api-management/set-graphql-resolver-policy.md",
         "redirect_url": "/previous-versions/azure/api-management/set-graphql-resolver-policy",

.openpublishing.redirection.azure-functions.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-functions/durable/durable-functions-configure-durable-functions-with-credentials.md",
+            "redirect_url": "/azure/azure-functions/durable/durable-functions-configure-managed-identity",
+            "redirect_document_id": false
+        }
+    ]
+}