diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index 7bfd7ec80a..e76385db59 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -1,31 +1,3 @@
-<<<<<<< HEAD
-
-/datum/admins/proc/create_mob(mob/user)
-	var/static/create_mob_html
-	if (!create_mob_html)
-		var/mobjs = null
-		mobjs = jointext(typesof(/mob), ";")
-		create_mob_html = file2text('html/create_object.html')
-		create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")
-
-	user << browse(replacetext(create_mob_html, "/* ref src */", "\ref[src]"), "window=create_mob;size=425x475")
-
-/proc/randomize_human(mob/living/carbon/human/H)
-	H.gender = pick(MALE, FEMALE)
-	H.real_name = random_unique_name(H.gender)
-	H.name = H.real_name
-	H.underwear = random_underwear(H.gender)
-	H.skin_tone = random_skin_tone()
-	H.hair_style = random_hair_style(H.gender)
-	H.facial_hair_style = random_facial_hair_style(H.gender)
-	H.hair_color = random_short_color()
-	H.facial_hair_color = H.hair_color
-	H.eye_color = random_eye_color()
-	H.dna.blood_type = random_blood_type()
-	H.update_body()
-	H.update_hair()
-=======
-
 /datum/admins/proc/create_mob(mob/user)
 	var/static/create_mob_html
 	if (!create_mob_html)
@@ -50,5 +22,4 @@
 	H.dna.blood_type = random_blood_type()
 	H.update_body()
 	H.update_hair()
->>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839)
-	H.update_body_parts()
\ No newline at end of file
+	H.update_body_parts()