fix conflicts

Author: markingmyname

articles/mysql/single-server/how-to-connect-with-managed-identity.md

@@ -4,12 +4,8 @@ description: Learn about how to connect and authenticate using Managed Identity
 ms.service: mysql
 ms.subservice: single-server
 ms.topic: how-to
-<<<<<<< HEAD
-ms.date: 06/20/2022
-=======
 author: savjani
 ms.author: pariks
->>>>>>> 6b4ba5025d42fdc3cbe8c75b02e6c4b1ad4f5ffd
 ms.custom: devx-track-csharp, devx-track-azurecli
 ms.date: 06/20/2022
 ---

articles/mysql/single-server/policy-reference.md

@@ -7,11 +7,7 @@ ms.topic: reference
 author: timwarner-msft
 ms.author: timwarner
 ms.custom: subject-policy-reference
-<<<<<<< HEAD
-ms.date: 05/12/2022
-=======
 ms.date: 06/20/2022
->>>>>>> 6b4ba5025d42fdc3cbe8c75b02e6c4b1ad4f5ffd
 ---
 
 # Azure Policy built-in definitions for Azure Database for MySQL

articles/mysql/single-server/quickstart-create-mysql-server-database-using-azure-portal.md

@@ -3,17 +3,10 @@ title: 'Quickstart: Create a server - Azure portal - Azure Database for MySQL'
 description: This article walks you through using the Azure portal to create a sample Azure Database for MySQL server in about five minutes.
 ms.service: mysql
 ms.subservice: single-server
-<<<<<<< HEAD
 ms.topic: quickstart
 author: savjani
 ms.author: pariks
 ms.custom: mvc, mode-ui
-=======
-author: savjani
-ms.author: pariks
-ms.custom: mvc, mode-ui
-ms.topic: quickstart
->>>>>>> 6b4ba5025d42fdc3cbe8c75b02e6c4b1ad4f5ffd
 ms.date: 06/20/2022
 ---