diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index 9112a29542..6c48531cf9 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -353,9 +353,6 @@ SUBSYSTEM_DEF(timer)
 
 /proc/addtimer(datum/callback/callback, wait, flags)
 	if (!callback)
-<<<<<<< HEAD
-		return
-=======
 		CRASH("addtimer called without a callback")
 
 	if (wait < 0)
@@ -364,7 +361,6 @@ SUBSYSTEM_DEF(timer)
 	//alot of things add short timers on themselves in their destroy, we ignore those cases
 	if (wait >= 1 && callback && callback.object && callback.object != GLOBAL_PROC && QDELETED(callback.object))
 		stack_trace("addtimer called with a callback assigned to a qdeleted object")
->>>>>>> f3b771b... Merge pull request #34774 from ShizCalev/addtimer-stack-track-typo
 
 	wait = max(wait, 0)
 
@@ -422,4 +418,4 @@ SUBSYSTEM_DEF(timer)
 
 
 #undef BUCKET_LEN
-#undef BUCKET_POS
\ No newline at end of file
+#undef BUCKET_POS