Fix merge conficts

Author: gitName

.openpublishing.redirection.json

@@ -26903,6 +26903,16 @@
       "redirect_url": "/training/modules/manage-system-health-azure-stack-hub/12-summary",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/learn-pr/github/github-introduction-products/5-knowledge-check.yml",
+      "redirect_url": "/training/modules/github-introduction-products/8-knowledge-check",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/learn-pr/github/github-introduction-products/6-summary.yml",
+      "redirect_url": "/training/modules/github-introduction-products/9-summary",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/learn-pr/wwl-azure/manage-system-health-azure-stack-hub/4-monitor-system-health-syslog-server.md",
       "redirect_url": "/training/modules/manage-system-health-azure-stack-hub/5-monitor-system-health-syslog-server",
@@ -46459,6 +46469,86 @@
       "redirect_url": "/training/browse/",
       "redirect_document_id": false
     },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/2-comprehensive-experience-for-all-cloud-environments.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/3-get-high-level-insights-permissions-management-dashboard.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/4-knowledge-check-insights.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/5-dive-deeper-with-analytics-tab.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/6-knowledge-check-analytics.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/7-develop-better-understanding-of-your-environment-with-reports.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/8-analyze-historical-data-with-audit-tab.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/9-act-on-your-findings-with-remediation-tab.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/10-knowledge-check-remediation.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/11-stay-informed-with-continuous-monitoring.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/12-knowledge-check-monitoring.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/13-manage-access-to-microsoft-entra-permissions-management.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/14-put-it-all-together.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/15-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/index.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "learn-pr/azure/build-cosmos-db-java-app/1-introduction.yml",
       "redirect_url": "https://learn.microsoft.com/azure/cosmos-db/nosql/quickstart-java",
@@ -46553,6 +46643,196 @@
       "source_path": "learn-pr/azure/azure-sql-high-availability/index.yml",
       "redirect_url": "https://learn.microsoft.com/training/modules/describe-high-availability-disaster-recovery-strategies/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/2-performance-capabilities.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/3-configure-maintain-performance.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/4-monitor-troubleshoot-performance.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/5-exercise-monitor-troubleshoot-performance.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/6-accelerate-tune-performance.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/7-exercise-scale-performance.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/8-exercise-optimize-app-performance.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/9-intelligent-performance.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/10-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-performance/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/2-security-capabilities.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/3-exercise-configure-sql-database.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/4-exercise-network-security.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/5-exercise-configure-authentication.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/6-data-protection.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/7-security-management.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/8-exercise-advanced-data-security.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/9-exercise-data-classification-masking-audit.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/10-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-secure-data/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/index.md",
+      "redirect_url": "/training/modules/classify-images/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/3-create-custom-project.md",
+      "redirect_url": "/training/modules/classify-images/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/5-exercise.md",
+      "redirect_url": "/training/modules/classify-images/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/1-introduction.md",
+      "redirect_url": "/training/modules/classify-images/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/6-knowledge-check.md",
+      "redirect_url": "/training/modules/classify-images/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/4-label-train-custom-model.md",
+      "redirect_url": "/training/modules/classify-images/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/7-summary.md",
+      "redirect_url": "/training/modules/classify-images/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/2-understand-custom-model-types.md",
+      "redirect_url": "/training/modules/classify-images/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/2-what-is-ciem.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/3-what-is-entra-permissions-management.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/4-how-entra-permissions-management-works.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/5-when-to-use-permissions-management.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/6-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/7-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/index.yml",
+      "redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
+      "redirect_document_id": false
     }
- ]
+  ]
 }

learn-pr/achievements.yml

@@ -5625,6 +5625,16 @@ achievements:
   title: Guided project langstons ant
   summary: This module will guide you through the steps required to develop your own Langston's Ant project. Your code will use interfaces to represent the functions the ants can perform.
   iconUrl: /training/achievements/guided-project-langstons-ant.svg
+- uid: learn.permissions-management.intro-to-entra-permissions-management.badge
+  type: badge
+  title: Introduction to Microsoft Entra Permissions Management 
+  summary: Microsoft Entra Permissions Management gives security operation administrators insight into over-privileged workload and user identities, actions, and resources across multicloud infrastructures.
+  iconUrl: /training/achievements/1-intro-to-entra-permissions-management.svg
+- uid: learn.permissions-management.explore-features-of-permissions-management.badge
+  type: badge
+  title: Explore the many features of Microsoft Entra Permissions Management
+  summary: While diving deeper into the features of Microsoft Entra Permissions Management, we use the framework of discover, remediate, monitor as a guide to help walkthrough how the Permissions Management features set can benefit your organization.
+  iconUrl: /training/achievements/2-explore-features-of-permissions-management.svg
 - uid: learn.cosmos-db-java-app.badge
   type: badge
   title: Build a Java app with cloud-scale NoSQL Cosmos DB
@@ -5635,3 +5645,18 @@ achievements:
   title: Deploy highly available solutions by using Azure SQL
   summary: Whatever SLA, RTO, and RPO your business requires, Azure SQL has the options and built-in capabilities to meet that availability. In this module, you'll learn how to translate your knowledge of backup and restore, failover cluster instances, and Always On availability groups to the options for business continuity in Azure SQL. You'll also peek under the hood at the architectures and how they affect availability.
   iconUrl: /training/achievements/azure-sql-high-availability.svg
+- uid: learn.azure-sql-performance.badge
+  type: badge
+  title: Deliver consistent performance with Azure SQL
+  summary: Azure SQL has the capabilities and tools to allow you to deliver consistent performance for your application. In this module, you will learn key aspects of configuration, monitoring, and intelligent performance for Azure SQL.
+  iconUrl: /training/achievements/azure-sql-performance.svg
+- uid: learn.azure-sql-secure-data.badge
+  type: badge
+  title: Secure your data with Azure SQL
+  summary: Ensuring the security and compliance of data is always a top priority. In this module, you learn how to use Azure SQL to secure your data, configure logins and users, use tools and techniques for monitoring security, ensure that your data meets industry and regulatory compliance standards, and take advantage of the extra benefits and intelligence that Azure provides. We also cover some of the networking considerations for securing SQL.
+  iconUrl: /training/achievements/azure-sql-secure-data.svg
+- uid: learn.wwl.custom-model-ai-vision-image-classification.badge
+  type: badge
+  title: Image classification with custom Azure AI Vision models
+  summary: Classify images by training a custom model with Azure AI Vision.
+  iconUrl: /learn/achievements/generic-badge.svg