Fix conflicts

Author: mattbriggs

articles/aks/howto-deploy-java-liberty-app.md

@@ -46,16 +46,13 @@ This article is intended to help you quickly get to deployment. Before going to
 >
 > :::image type="icon" source="~/reusable-content/ce-skilling/azure/media/cloud-shell/launch-cloud-shell-button.png" alt-text="Button to launch the Azure Cloud Shell." border="false" link="https://shell.azure.com":::
 
-<<<<<<< HEAD
 * If running the commands in this guide locally (instead of Azure Cloud Shell):
   * Prepare a local machine with Unix-like operating system installed (for example, Ubuntu, Azure Linux, macOS, Windows Subsystem for Linux).
   * Install a Java SE implementation, version 17 or later. (for example, [Eclipse Open J9](https://www.eclipse.org/openj9/)).
   * Install [Maven](https://maven.apache.org/download.cgi) 3.5.0 or higher.
   * Install [Docker](https://docs.docker.com/get-docker/) for your OS.
 * Make sure you're assigned either the `Owner` role or the `Contributor` and `User Access Administrator` roles in the subscription. You can verify it by following steps in [List role assignments for a user or group](../role-based-access-control/role-assignments-list-portal.yml#list-role-assignments-for-a-user-or-group).
 
-=======
->>>>>>> 7e93f91ba8d1bfe6ba30f41f9972179785c467df
 ## Create a Liberty on AKS deployment using the portal
 
 The following steps guide you to create a Liberty runtime on AKS. After completing these steps, you have an Azure Container Registry and an Azure Kubernetes Service cluster for deploying your containerized application.

articles/api-management/how-to-configure-service-fabric-backend.md

@@ -10,16 +10,9 @@ ms.date: 03/25/2024
 
 # Alerts schemas
 
-<<<<<<< HEAD
-
-You can view these security alerts in Microsoft Defender for Cloud's pages - [overview dashboard](overview-page.md), [alerts](managing-and-responding-alerts.yml), [resource health pages](investigate-resource-health.md), or [workload protections dashboard](workload-protections-dashboard.md) - and through external tools such as:
-=======
 Defender for Cloud provides alerts that help you identify, understand, and respond to security threats. Alerts are generated when Defender for Cloud detects suspicious activity or a security-related issue in your environment. You can view these alerts in the Defender for Cloud portal, or you can export them to external tools for further analysis and response.
 
-You can review security alerts from the [overview dashboard](overview-page.md), [alerts](managing-and-responding-alerts.md) page, [resource health pages](investigate-resource-health.md), or [workload protections dashboard](workload-protections-dashboard.md).
-
-The following external tools can be used to consume alerts from Defender for Cloud:
->>>>>>> 7e93f91ba8d1bfe6ba30f41f9972179785c467df
+You can view these security alerts in Microsoft Defender for Cloud's pages - [overview dashboard](overview-page.md), [alerts](managing-and-responding-alerts.yml), [resource health pages](investigate-resource-health.md), or [workload protections dashboard](workload-protections-dashboard.md) - and through external tools such as:
 
 - [Microsoft Sentinel](../sentinel/index.yml) - Microsoft's cloud-native SIEM. The Sentinel Connector gets alerts from Microsoft Defender for Cloud and sends them to the [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) for Microsoft Sentinel.
 - Third-party SIEMs - Send data to [Azure Event Hubs](../event-hubs/index.yml). Then integrate your Event Hubs data with a third-party SIEM. Learn more in [Stream alerts to a SIEM, SOAR, or IT Service Management solution](export-to-siem.md).

articles/defender-for-cloud/alerts-schemas.md

@@ -94,9 +94,5 @@ The following regulatory standards are available in Defender for Cloud:
 
 ## Related content
 
-<<<<<<< HEAD
 - [Assign regulatory compliance standards](update-regulatory-compliance-packages.yml)
 - [Improve regulatory compliance](regulatory-compliance-dashboard.md)
-=======
-- [Assign regulatory compliance standards](update-regulatory-compliance-packages.md)
->>>>>>> 7e93f91ba8d1bfe6ba30f41f9972179785c467df

articles/defender-for-cloud/concept-regulatory-compliance-standards.md

@@ -68,11 +68,6 @@ Defender for Cloud sends email notifications when it detects anomalous database
 
 ## Next step
 
-<<<<<<< HEAD
 - [Automate responses to Defender for Cloud triggers](workflow-automation.yml)
 - [Stream alerts to a SIEM, SOAR, or ITSM solution](export-to-siem.md)
 - [Suppress alerts from Defender for Cloud](alerts-suppression-rules.md)
-=======
-> [!div class="nextstepaction"]
-> [Automate responses to Defender for Cloud triggers](workflow-automation.md)
->>>>>>> 7e93f91ba8d1bfe6ba30f41f9972179785c467df

articles/defender-for-cloud/defender-for-databases-usage.md

@@ -103,8 +103,4 @@ The risk level is determined by a context-aware risk-prioritization engine that
 - [Review security recommendations](review-security-recommendations.md)
 - [Remediate security recommendations](implement-security-recommendations.md)
 - [Drive remediation with governance rules](governance-rules.md)
-<<<<<<< HEAD
 - [Automate remediation responses](workflow-automation.yml)
-=======
-- [Automate remediation responses](workflow-automation.md)
->>>>>>> 7e93f91ba8d1bfe6ba30f41f9972179785c467df