diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index d162cc3616..7ddfc9e088 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 var/list/gamemode_cache = list()
 
 /datum/configuration