diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 75f9fbd3d0..0b79afb941 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -113,4 +113,3 @@
 		for(var/path in subtypesof(prototype))
 			L+= path
 		return L
->>>>>>> 4178c20... Configuration datum refactor (#30763)