diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 430fd2fe228cc..49407cc696026 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -853,7 +853,6 @@
 				warn_if_staff_same_ip = TRUE
 			if ("deletion_starts_paused")
 				deletion_starts_paused = TRUE
-<<<<<<< ours
 			// [SIERRA-ADD]
 			if ("shutdown_on_reboot")
 				shutdown_on_reboot = TRUE
@@ -866,10 +865,8 @@
 			if("minimum_byondacc_age")
 				minimum_byondacc_age = text2num(value)
 			// [/SIERRA-ADD]
-=======
 			if ("enable_cold_mist")
 				enable_cold_mist = TRUE
->>>>>>> theirs
 			else
 				log_misc("Unknown setting in config/config.txt: '[name]'")