diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index 0abb451d2d..8a7c030458 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -3,17 +3,11 @@
 /proc/_abs(A)
 	return abs(A)
 
-<<<<<<< HEAD
-/*/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags_1 = null)
-	animate(A, set_vars, time, loop, easing, flags_1)
-	Borked. If anyone wants to fix this be my guest.*/
-=======
 /proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null)
 	var/mutable_appearance/MA = new()
 	for(var/v in set_vars)
 		MA.vars[v] = set_vars[v]
 	animate(A, appearance = MA, time, loop, easing, flags)
->>>>>>> 517a747... Merge pull request #32292 from RemieRichards/patch-5
 
 /proc/_acrccos(A)
 	return arccos(A)