diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index b41f5da582..6665d36e80 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -41,7 +41,11 @@
 
 	return src
 
+<<<<<<< HEAD
 /mob/new_player/AIize(var/move)
+=======
+/mob/new_player/AIize(var/move = TRUE)
+>>>>>>> 37d66ca... Fixes runtime in AI generation (#7224)
 	spawning = 1
 	return ..()
 
@@ -59,7 +63,13 @@
 	return O
 	//VOREStation Edit End
 
+<<<<<<< HEAD
 /mob/living/carbon/AIize(var/move)
+=======
+	return ..(move)
+
+/mob/living/carbon/AIize(var/move = TRUE)
+>>>>>>> 37d66ca... Fixes runtime in AI generation (#7224)
 	if (transforming)
 		return
 	for(var/obj/item/W in src)
@@ -73,7 +83,7 @@
 /mob/proc/AIize(var/move = TRUE)
 	if(client)
 		src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs
-	
+
 	var/newloc = loc
 	if(move)
 		var/obj/loc_landmark