diff --git a/code/controllers/configuration/entries/comms.dm b/code/controllers/configuration/entries/comms.dm
index 70197b6fd4..56cec985f1 100644
--- a/code/controllers/configuration/entries/comms.dm
+++ b/code/controllers/configuration/entries/comms.dm
@@ -4,11 +4,7 @@
 /datum/config_entry/string/comms_key/ValidateAndSet(str_val)
     return str_val != "default_pwd" && length(str_val) > 6 && ..()
 
-<<<<<<< HEAD
-CONFIG_DEF(string/cross_server_address)
-=======
 /datum/config_entry/keyed_string_list/cross_server
->>>>>>> 8c537ea... Adds config inclusion system (#33307)
 	protection = CONFIG_ENTRY_LOCKED
 
 /datum/config_entry/string/cross_server_address/ValidateAndSet(str_val)
@@ -21,4 +17,4 @@ GLOBAL_VAR_INIT(medals_enabled, TRUE)	//will be auto set to false if the game fa
 /datum/config_entry/string/medal_hub_address
 
 /datum/config_entry/string/medal_hub_password
-	protection = CONFIG_ENTRY_HIDDEN
\ No newline at end of file
+	protection = CONFIG_ENTRY_HIDDEN