fixed conflicts

Author: markingmyname

articles/mysql/flexible-server/concepts-networking-vnet.md

@@ -76,11 +76,7 @@ Here are some concepts to be familiar with when using virtual networks with MySQ
 - If you use Azure API, an Azure Resource Manager template (ARM template), or Terraform, create private DNS zones that end with `mysql.database.azure.com` and use them while configuring flexible servers with private access. For more information, see the [private DNS zone overview](../../dns/private-dns-overview.md).
 
    > [!IMPORTANT]  
-<<<<<<< HEAD
    > Private DNS zone names must end with `mysql.database.azure.com`. If you are connecting to an Azure Database for MySQL flexible server with SSL and you're using an option to perform full verification (sslmode=VERIFY_IDENTITY) with certificate subject name, use \<servername\>.mysql.database.azure.com in your connection string.
-=======
-   > Private DNS zone names must end with `mysql.database.azure.com`. If you are connecting to an Azure Database for MySQL - Flexible Server with SSL and you're using an option to perform full verification (sslmode=VERTIFY_IDENTITY) with certificate subject name, use \<servername\>.mysql.database.azure.com in your connection string.
->>>>>>> ec6d0faf1a110eb2a694b78b22bb8ae2ca64be81
 
 Learn how to create a flexible server with private access (VNet integration) in [the Azure portal](how-to-manage-virtual-network-portal.md) or [the Azure CLI](how-to-manage-virtual-network-cli.md).
 

articles/mysql/flexible-server/connect-with-powerbi-desktop.md

@@ -11,14 +11,10 @@ ms.date: 09/01/2022
 
 # Import data from Azure Database for MySQL - Flexible Server in Power BI 
 
-<<<<<<< HEAD
->[!NOTE]
+> [!NOTE]
 > This article applies to Power BI Desktop only. Currently Power Query online or Power BI Service is **not supported**. 
 
 With Power BI Desktop you can visually explore your data through a free-form drag-and-drop canvas, a broad range of modern data visualizations, and an easy-to-use report authoring experiences. You can import directly from the tables or import from a SELECT query. In this quickstart you will learn how to connect with Azure Database for MySQL - Flexible Server with Power BI Desktop. 
-=======
-With Power BI Desktop, you can visually explore your data through a free-form drag-and-drop canvas, a broad range of modern data visualizations, and an easy-to-use report authoring experiences. You can import directly from the tables or import from a SELECT query. In this quickstart, you learn how to connect with Azure Database for MySQL Flexible Server with Power BI Desktop. 
->>>>>>> 04760257ec317275b27e75537e8e1e2600db121c
 
 ## Prerequisites
 
@@ -33,11 +29,7 @@ With Power BI Desktop, you can visually explore your data through a free-form dr
 
 ## Connect with Power BI desktop from Azure portal 
 
-<<<<<<< HEAD
-Get the connection information needed to connect to the Azure Database for MySQL - Flexible Server. You need the fully qualified server name and sign in credentials.
-=======
-You can open your database in Power BI desktop from Azure portal with a few clicks. 
->>>>>>> 04760257ec317275b27e75537e8e1e2600db121c
+Get the connection information needed to connect to the Azure Database for MySQL flexible server. You need the fully qualified server name and sign in credentials.
 
 1. Sign in to the [Azure portal](https://portal.azure.com/).
 2. From the left-hand menu in Azure portal, select **All resources**, and then search for the server you've created (such as **mydemoserver**).

articles/mysql/flexible-server/quickstart-create-arm-template.md

@@ -14,7 +14,7 @@ ms.date: 02/16/2023
 
 [!INCLUDE [applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
 
-[!INCLUDE [About Azure Database for MySQL - Flexible Server](../includes/azure-database-for-mysql-flexible-server-abstract.md)]
+[!INCLUDE [About Azure Database for MySQL - Flexible Server](../includes/Azure-database-for-mysql-flexible-server-abstract.md)]
 
 [!INCLUDE [About Azure Resource Manager](../../../includes/resource-manager-quickstart-introduction.md)]
 
@@ -497,69 +497,9 @@ az deployment group create --resource-group exampleRG --template-file azuredeplo
 
 # [PowerShell](#tab/PowerShell)
 
-<<<<<<< HEAD
-Follow these steps to verify if your server was created in Azure.
-
-### Azure portal
-
-1. In the [Azure portal](https://portal.azure.com), search for and select **Azure Database for MySQL servers**.
-1. In the database list, select your new server. The **Overview** page for your new Azure Database for MySQL server appears.
-
-### PowerShell
-
-You'll have to enter the name of the new server to view the details of your Azure Database for MySQL - Flexible Server.
-
-```azurepowershell-interactive
-$serverName = Read-Host -Prompt "Enter the name of your Azure Database for MySQL server"
-Get-AzResource -ResourceType "Microsoft.DBforMySQL/flexibleServers" -Name $serverName | ft
-Write-Host "Press [ENTER] to continue..."
-```
-
-### CLI
-
-You'll have to enter the name and the resource group of the new server to view details about your Azure Database for MySQL - Flexible Server.
-
-```azurecli-interactive
-echo "Enter your Azure Database for MySQL server name:" &&
-read serverName &&
-echo "Enter the resource group where the Azure Database for MySQL server exists:" &&
-read resourcegroupName &&
-az resource show --resource-group $resourcegroupName --name $serverName --resource-type "Microsoft.DbForMySQL/flexibleServers"
-```
-
-## Clean up resources
-
-Keep this resource group, server, and single database if you want to go to the [Next steps](#next-steps). The next steps show you how to connect and query your database using different methods.
-
-To delete the resource group:
-
-### Azure portal
-
-1. In the [Azure portal](https://portal.azure.com), search for and select **Resource groups**.
-1. In the resource group list, choose the name of your resource group.
-1. In the **Overview** page of your resource group, select **Delete resource group**.
-1. In the confirmation dialog box, type the name of your resource group, and then select **Delete**.
-
-### PowerShell
-
-```azurepowershell-interactive
-$resourceGroupName = Read-Host -Prompt "Enter the Resource Group name"
-Remove-AzResourceGroup -Name $resourceGroupName
-Write-Host "Press [ENTER] to continue..."
-```
-
-### CLI
-
-```azurecli-interactive
-echo "Enter the Resource Group name:" &&
-read resourceGroupName &&
-az group delete --name $resourceGroupName &&
-echo "Press [ENTER] to continue ..."
-=======
 ```azurepowershell
 New-AzResourceGroup -Name exampleRG -Location eastus
 New-AzResourceGroupDeployment -ResourceGroupName exampleRG -TemplateFile azuredeploy.json
->>>>>>> 60651a3d247d2413e6b9c5a301d846ded7170aa7
 ```
 
 ---
@@ -602,7 +542,6 @@ Remove-AzResourceGroup -Name exampleRG
 
 ---
 
-
 ## Next steps
 
 For a step-by-step tutorial that guides you through the process of creating an ARM template, see:

articles/mysql/flexible-server/tutorial-add-redis-to-mysql.md

@@ -13,11 +13,7 @@ ms.date: 12/07/2022
 
 [!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
 
-<<<<<<< HEAD
-This article demonstrates how to boost the performance of an Azure Database for MySQL - Flexible Server using [Azure cache for Redis](../../azure-cache-for-redis/cache-overview.md). Azure cache for Redis is a secure data cache and messaging broker that provides high throughput and low-latency access to data for applications.
-=======
 This article demonstrates how to boost the performance of an Azure Database for MySQL flexible server using [Azure Cache for Redis](../../azure-cache-for-redis/cache-overview.md). Azure Cache for Redis is a secure data cache and messaging broker that provides high throughput and low-latency access to data for applications.
->>>>>>> ae8c443e250f9ec1e9ad900a612ad8b993c7b5bf
 
 ## Prerequisites