Fix merge conflicts

Author: ShawnKupfer

.openpublishing.redirection.json

@@ -19432,6 +19432,70 @@
       "source_path_from_root": "/learn-pr/windows/wsl-introduction/understanding-workflow.yml",
       "redirect_url": "https://learn.microsoft.com/windows/wsl/about"
     },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/2-cloud-adoption-framework-overview.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/3-define-strategy.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/4-plan.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/5-ready.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/6-adopt.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/7-govern-and-manage.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/8-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/9-summary-and-resources.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-mba/microsoft-cloud-adoption-framework-for-azure/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-getting-started/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-getting-started/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-getting-started/2-customer-narrative.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-getting-started/3-common-blockers.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-getting-started/4-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-getting-started/5-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/modules/cloud-adoption-framework"
+    },
     {
       "source_path_from_root": "/learn-pr/windows/wsl-introduction/what-is-wsl.yml",
       "redirect_url": "https://learn.microsoft.com/windows/wsl/about"
@@ -42249,6 +42313,41 @@
        "redirect_url": "/training/modules/security-monitoring-automation-solutions/11-summary",
        "redirect_document_id": false
     },
+    {
+      "source_path": "learn-pr/vs-code/introduction-to-visual-studio-code/1-introduction.yml",
+      "redirect_url": "https://code.visualstudio.com/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/vs-code/introduction-to-visual-studio-code/2-what-is-visual-studio-code.yml",
+      "redirect_url": "https://code.visualstudio.com/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/vs-code/introduction-to-visual-studio-code/3-how-visual-studio-code-works.yml",
+      "redirect_url": "https://code.visualstudio.com/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/vs-code/introduction-to-visual-studio-code/4-when-to-use-visual-studio-code.yml",
+      "redirect_url": "https://code.visualstudio.com/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/vs-code/introduction-to-visual-studio-code/5-knowledge-check.yml",
+      "redirect_url": "https://code.visualstudio.com/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/vs-code/introduction-to-visual-studio-code/6-summary.yml",
+      "redirect_url": "https://code.visualstudio.com/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/vs-code/introduction-to-visual-studio-code/index.yml",
+      "redirect_url": "https://code.visualstudio.com/",
+      "redirect_document_id": false
+    },
     {
       "source_path": "learn-pr/wwl-azure/observability-continuous-improvement/7-knowledge-check.yml",
       "redirect_url": "/training/modules/observability-continuous-improvement/8-knowledge-check",
@@ -42383,6 +42482,11 @@
       "source_path": "learn-pr/language/vue-data-events/index.yml",
       "redirect_url": "https://learn.microsoft.com/training/browse/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-virtual-machine-availability/11-simulation-machine-scale.md",
+      "redirect_url": "/training/modules/configure-virtual-machine-availability/",
+      "redirect_document_id": false
     }
   ]
-}
+}

learn-pr/achievements.yml

@@ -3263,6 +3263,11 @@ achievements:
   title: Configure Azure Kubernetes Service
   summary: Learn how to configure Azure Kubernetes Service including networking, storage, and scaling.
   iconUrl: /training/achievements/azure-kubernetes-configure.svg
+- uid: learn.azure.cloud-adoption-framework-getting-started.badge
+  type: badge
+  title: Getting started with the Microsoft Cloud Adoption Framework for Azure
+  summary: The Microsoft Cloud Adoption Framework for Azure is a guide to the full lifecycle of cloud adoption. Along your organization's journey to the cloud, you encounter roadblocks that can be easily removed through common approaches that thousands of customers share.
+  iconUrl: /training/achievements/cloud-adoption-framework-getting-started.svg
 - uid: learn.data-ai.azure-for-the-data-engineer.trophy
   type: trophy
   title: Azure for the Data Engineer
@@ -5130,3 +5135,8 @@ achievements:
   title: Work with data and events in Vue.js
   summary: Dynamic web applications typically allow users to interact with the page and data. In this module, you'll see how to add forms to a Vue.js page and respond to user events. You'll also see how to add computed values that can be calculated based on updates to the data.
   iconUrl: /training/achievements/vue-data-events.svg
+- uid: learn.introduction-to-visual-studio-code.badge
+  type: badge
+  title: Introduction to Visual Studio Code
+  summary: In this module, you learn how to assess whether Visual Studio Code is the right source code editor for you. We explore how Visual Studio Code can be used in different development situations, for example, web, C++, and data science. We also examine Visual Studio Code's features such as the editor, debugger, and source control. Finally, we walk you through decision criteria you can use to choose a code editor.
+  iconUrl: /learn/achievements/introduction-to-visual-studio-code.svg