Fix merge conflicts

Author: ShawnKupfer

.openpublishing.redirection.json

@@ -45191,6 +45191,181 @@
       "redirect_url": "https://learn.microsoft.com/training/browse/",
       "redirect_document_id": false
     },
+    {
+      "source_path": "learn-pr/paths/create-bots-azure-health-bot/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-basic-bot/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-basic-bot/2-get-started-with-custom-scenario.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-basic-bot/3-build-the-basic-bot.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-basic-bot/4-bonus-conversational-elements.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-basic-bot/5-exercise-provision-webchat-channel.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-basic-bot/6-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-basic-bot/7-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-basic-bot/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-built-in-scenarios/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-built-in-scenarios/2-what-are-built-in-scenarios.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-built-in-scenarios/3-knowledge-check-1.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-built-in-scenarios/4-configure-built-in-scenario.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-built-in-scenarios/5-knowledge-check-2.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-built-in-scenarios/6-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-built-in-scenarios/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-case-studies/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-case-studies/2-usa-case-studies.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-case-studies/3-middle-east-europe-case-studies.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-case-studies/4-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-case-studies/5-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-case-studies/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-channelized-bot/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-channelized-bot/2-channeling-bot-to-teams.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-channelized-bot/3-building-basic-app.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-channelized-bot/4-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-channelized-bot/5-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-channelized-bot/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-enhanced/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-enhanced/2-interrupting-vs-breaking-scenario.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-enhanced/3-interrupting-scenario.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-enhanced/4-breaking-scenario.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-enhanced/5-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-enhanced/6-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/health-bot-enhanced/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
     {
       "source_path": "learn-pr/student-evangelism/health-bot-integrated-bot/1-introduction.yml",
       "redirect_url": "https://learn.microsoft.com/training/browse/",

learn-pr/achievements.yml

@@ -5460,3 +5460,33 @@ achievements:
   title: Integrate Azure Health Bot with a database
   summary: Learn how to integrate an advanced bot with a database.
   iconUrl: /training/achievements/student-evangelism/health-bot-integrated-bot.svg
+- uid: learn.student-evangelism.health-bot-enhanced.badge
+  type: badge
+  title: Enhanced Azure Health Bot
+  summary: In the previous module, you created a basic informative bot without any interrupting or breaking scenario involved. This module shows you how to enhance the bot with advanced functionalities.
+  iconUrl: /training/achievements/student-evangelism/health-bot-enhanced.svg
+- uid: learn.student-evangelism.health-bot-channelized-bot.badge
+  type: badge
+  title: Channelized Azure Health Bot
+  summary: In the previous module, you integrated a bot with a database hosted on Azure. This module shows you how to make the bot available on Teams and build a basic app.
+  iconUrl: /training/achievements/student-evangelism/health-bot-channelized-bot.svg
+- uid: learn.student-evangelism.health-bot-case-studies.badge
+  type: badge
+  title: Azure Health Bot case studies
+  summary: The Health Bot service is a cloud platform that empowers developers in healthcare organizations to build and deploy compliant, AI-powered virtual health assistants and health bots that help them improve processes and reduce costs.
+  iconUrl: /training/achievements/student-evangelism/health-bot-case-studies.svg
+- uid: learn.student-evangelism.health-bot-built-in-scenarios.badge
+  type: badge
+  title: Azure Health Bot built-in scenarios
+  summary: Azure Health Bot supports many built-in scenarios. Examples include triaging a medical condition, finding information about a disease or types of drugs, and getting user consent.
+  iconUrl: /training/achievements/student-evangelism/health-bot-built-in-scenarios.svg
+- uid: learn.create-bots-azure-health-bot.trophy
+  type: trophy
+  title: Create intelligent health bots with Azure Health Bot
+  summary: Azure Health Bot enables users to build a health bot by using built-in or custom scenarios. The information that each instance of the Health Bot service handles is privacy protected to HIPAA standards. It also meets Microsoft's high standards for privacy and security. The modules in this Learning path guide you through the creation of both a basic and enhanced health bot. You'll learn about language understanding and how to use both built-in and template scenarios.
+  iconUrl: /training/achievements/create-bots-azure-health-bot.svg
+- uid: learn.student-evangelism.health-bot-basic-bot.badge
+  type: badge
+  title: Basic Azure Health Bot
+  summary: This module starts with a basic informative bot that has no interrupting or breaking scenario involved. It shows you how to enhance the bot with more advanced functionalities.
+  iconUrl: /training/achievements/student-evangelism/health-bot-basic-bot.svg

learn-pr/azure/modify-azure-resource-manager-template-reuse/1-introduction.yml

@@ -6,7 +6,7 @@ metadata:
   prefetch-feature-rollout: true
   title: Introduction
   description: Introduction.
-  ms.date: 10/18/2024
+  ms.date: 03/05/2025
   author: mumian
   ms.author: jgao
   ms.topic: unit

learn-pr/azure/modify-azure-resource-manager-template-reuse/2-azure-resource-manager-functions.yml

@@ -6,7 +6,7 @@ metadata:
   prefetch-feature-rollout: true
   title: Add flexibility to your Azure Resource Manager template by using template functions
   description: Discover how to work with several Azure Resource Manager functions to create useful expressions.
-  ms.date: 10/18/2024
+  ms.date: 03/05/2025
   author: mumian
   ms.author: jgao
   ms.topic: unit

learn-pr/azure/modify-azure-resource-manager-template-reuse/3-exercise-use-functions-create-expression.yml

@@ -6,7 +6,7 @@ metadata:
   prefetch-feature-rollout: true
   title: Exercise - Use Azure Resource Manager functions to create expressions
   description: Use several Azure Resource Manager functions to create an expression for the unique Azure Storage account name.
-  ms.date: 10/18/2024
+  ms.date: 03/05/2025
   author: mumian
   ms.author: jgao
   ms.topic: unit

learn-pr/azure/modify-azure-resource-manager-template-reuse/4-azure-resource-manager-variables.yml

@@ -6,7 +6,7 @@ metadata:
   prefetch-feature-rollout: true
   title: Reuse expressions by using Azure Resource Manager template variables
   description: Discover how to work with Azure Resource Manager variables to reuse expressions in your template.
-  ms.date: 10/18/2024
+  ms.date: 03/05/2025
   author: mumian
   ms.author: jgao
   ms.topic: unit

learn-pr/azure/modify-azure-resource-manager-template-reuse/5-exercise-use-variables-store-expressions.yml

@@ -6,7 +6,7 @@ metadata:
   prefetch-feature-rollout: true
   title: Exercise - Use Azure Resource Manager variables to store expressions
   description: Use an Azure Resource Manager variable to store your Azure Storage account unique name expressions for ease of reuse.
-  ms.date: 10/18/2024
+  ms.date: 03/05/2025
   author: mumian
   ms.author: jgao
   ms.topic: unit

learn-pr/azure/modify-azure-resource-manager-template-reuse/6-azure-resource-manager-tags-parameter-files.yml

@@ -6,7 +6,7 @@ metadata:
   prefetch-feature-rollout: true
   title: Maintain multiple Azure deployments with Azure Resource Manager template tags and parameter files
   description: Use Azure Resource Manager template tags to identify the resources of multiple Azure deployment environments. Use Azure Resource Manager template parameter files to manage the deployment of your templates to multiple Azure deployment environments.
-  ms.date: 10/18/2024
+  ms.date: 03/05/2025
   author: mumian
   ms.author: jgao
   ms.topic: unit

learn-pr/azure/modify-azure-resource-manager-template-reuse/7-exercise-use-tags-parameter-files.yml

@@ -6,7 +6,7 @@ metadata:
   prefetch-feature-rollout: true
   title: Exercise - Use Azure Resource Manager tags and parameter files
   description: Update the tags on your Azure Storage account resource for better tracking, and use multiple parameter files to deploy the template to multiple Azure environments.
-  ms.date: 10/18/2024
+  ms.date: 03/05/2025
   author: mumian
   ms.author: jgao
   ms.topic: unit

learn-pr/azure/modify-azure-resource-manager-template-reuse/8-knowledge-check.yml

@@ -6,7 +6,7 @@ metadata:
   prefetch-feature-rollout: true
   title: Knowledge check
   description: Check your knowledge.
-  ms.date: 10/18/2024
+  ms.date: 03/05/2025
   author: mumian
   ms.author: jgao
   ms.topic: unit