diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm
index a18032a7e1..92dcb9baf0 100644
--- a/code/controllers/configuration/config_entry.dm
+++ b/code/controllers/configuration/config_entry.dm
@@ -51,14 +51,11 @@
 		return FALSE
 	return ..()
 
-<<<<<<< HEAD
-=======
 /datum/config_entry/proc/VASProcCallGuard(str_val)
 	. = !(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "ValidateAndSet" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
 	if(!.)
 		log_admin_private("Config set of [type] to [str_val] attempted by [key_name(usr)]")
-
->>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental
+		
 /datum/config_entry/proc/ValidateAndSet(str_val)
 	CRASH("Invalid config entry type!")