diff --git a/docs/administration-guide/01-managing-databases.md b/docs/administration-guide/01-managing-databases.md
index c085995895c0b46edbd85e38f9a8c6e64921039e..ffd6f38d51ee0bbf6d7f97aa32b4f94f325ba77f 100644
--- a/docs/administration-guide/01-managing-databases.md
+++ b/docs/administration-guide/01-managing-databases.md
@@ -14,17 +14,12 @@ Now you’ll see a list of your databases. To connect another database to Metaba
 * [Google BigQuery](databases/bigquery.md)
 * H2
 * MongoDB (version 3.0 or higher)
-* MySQL (version 4.1 or higher)
+* MySQL (version 4.1 or higher, as well as MariaDB)
 * Postgres
 * SQLite
 * SQL Server
-<<<<<<< HEAD
-* Druid
-* Crate
-=======
 * Driud
 * [CrateDB](databases/cratedb.md)
->>>>>>> 4edea959ea604ffafd2f3970dc86bf1c6d8b68af
 * [Oracle](databases/oracle.md)
 * [Vertica](databases/vertica.md)