diff --git a/gradle.properties b/gradle.properties
index 2a65d0f0f..58b809908 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,17 +28,6 @@ org.gradle.java.installations.auto-download=false
 # Db2, MySql, PostgreSQL, CockroachDB, SqlServer, Oracle
 <<<<<<< Updated upstream
 #db = MSSQL
-=======
-<<<<<<< Updated upstream
-db = Maria
-=======
-<<<<<<< Updated upstream
-#db = MSSQL
-=======
-db = mysql
->>>>>>> Stashed changes
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 
 # Enable the SonatypeOS maven repository (mainly for Vert.x snapshots) when present (value ignored)
 #enableSonatypeOpenSourceSnapshotsRep = true