Merge branch 'release-azuresql' of https://github.com/MicrosoftDocs/azure-docs-pr into 20200506_overview

Author: MashaMSFT

articles/sql-database/includes/sql-database-create-manage-portal.md

@@ -14,11 +14,7 @@ The Azure portal provides a single page where you can manage [all of your Azure
 To access the **Azure SQL** page, from the Azure portal menu, select **Azure SQL** or search for and select **Azure SQL** in any page.
 
 > [!NOTE]
-<<<<<<< HEAD
-> **Azure SQL** provides a quick and easy way to access all of your SQL resources in the Azure portal, including single and pooled database in Azure SQL Database as well as the logical SQL server hosting them, SQL Managed Instances, and SQL virtual machines.  Azure SQL is not a service or resource. 
-=======
-> **Azure SQL** provides a quick and easy way to access all of your SQL databases, elastic pools, logical SQL servers, SQL managed instances, and SQL virtual machines. Azure SQL is not a service or resource. 
->>>>>>> e710800e3e0a35296ad8218139d188d8d7d81c0c
+> **Azure SQL** provides a quick and easy way to access all of your SQL resources in the Azure portal, including single and pooled database in Azure SQL Database as well as the logical SQL server hosting them, SQL Managed Instances, and SQL virtual machines.  [Azure SQL](../what-is-azure-sql-iaas-vs-paas.md) is not a service or resource, but rather a family of SQL-related services. 
 
 To manage existing resources, select the desired item in the list. To create new Azure SQL resources, select **+ Add**.