diff --git a/README.md b/README.md
index f51647b568..bd86a59216 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,12 @@ To enable an away mission open `config/awaymissionconfig.txt` and uncomment one
 
 ## SQL SETUP
 
+<<<<<<< HEAD
 The SQL backend requires a MySQL server. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes.  More detailed setup instructions are located here: http://www.tgstation13.org/wiki/Downloading_the_source_code#Setting_up_the_database
+=======
+The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes.  More detailed setup instructions are located here: https://www.tgstation13.org/wiki/Downloading_the_source_code#Setting_up_the_database
+
+>>>>>>> e0b2b71... Merge pull request #32999 from MrStonedOne/patch-451
 
 ## IRC BOT SETUP