diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm
index 45e4f66548..36191203ad 100644
--- a/code/modules/mob/living/carbon/alien/larva/powers.dm
+++ b/code/modules/mob/living/carbon/alien/larva/powers.dm
@@ -1,67 +1,3 @@
-<<<<<<< HEAD
-/obj/effect/proc_holder/alien/hide
-	name = "Hide"
-	desc = "Allows aliens to hide beneath tables or certain items. Toggled on or off."
-	plasma_cost = 0
-
-	action_icon_state = "alien_hide"
-
-/obj/effect/proc_holder/alien/hide/fire(mob/living/carbon/alien/user)
-	if(user.stat != CONSCIOUS)
-		return
-
-	if (user.layer != ABOVE_NORMAL_TURF_LAYER)
-		user.layer = ABOVE_NORMAL_TURF_LAYER
-		user.visible_message("<span class='name'>[user] scurries to the ground!</span>", \
-						"<span class='noticealien'>You are now hiding.</span>")
-	else
-		user.layer = MOB_LAYER
-		user.visible_message("[user.] slowly peeks up from the ground...", \
-					"<span class='noticealien'>You stop hiding.</span>")
-	return 1
-
-
-/obj/effect/proc_holder/alien/larva_evolve
-	name = "Evolve"
-	desc = "Evolve into a higher alien caste."
-	plasma_cost = 0
-
-	action_icon_state = "alien_evolve_larva"
-
-/obj/effect/proc_holder/alien/larva_evolve/fire(mob/living/carbon/alien/user)
-	if(!islarva(user))
-		return
-	var/mob/living/carbon/alien/larva/L = user
-
-	if(L.handcuffed || L.legcuffed) // Cuffing larvas ? Eh ?
-		to_chat(user, "<span class='danger'>You cannot evolve when you are cuffed.</span>")
-
-	if(L.amount_grown >= L.max_grown)	//TODO ~Carn
-		to_chat(L, "<span class='name'>You are growing into a beautiful alien! It is time to choose a caste.</span>")
-		to_chat(L, "<span class='info'>There are three to choose from:")
-		to_chat(L, "<span class='name'>Hunters</span> <span class='info'>are the most agile caste, tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.</span>")
-		to_chat(L, "<span class='name'>Sentinels</span> <span class='info'>are tasked with protecting the hive. With their ranged spit, invisibility, and high health, they make formidable guardians and acceptable secondhand hunters.</span>")
-		to_chat(L, "<span class='name'>Drones</span> <span class='info'>are the weakest and slowest of the castes, but can grow into a praetorian and then queen if no queen exists, and are vital to maintaining a hive with their resin secretion abilities.</span>")
-		var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
-
-		if(user.incapacitated()) //something happened to us while we were choosing.
-			return
-
-		var/mob/living/carbon/alien/humanoid/new_xeno
-		switch(alien_caste)
-			if("Hunter")
-				new_xeno = new /mob/living/carbon/alien/humanoid/hunter(L.loc)
-			if("Sentinel")
-				new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(L.loc)
-			if("Drone")
-				new_xeno = new /mob/living/carbon/alien/humanoid/drone(L.loc)
-
-		L.alien_evolve(new_xeno)
-		return 0
-	else
-		to_chat(user, "<span class='danger'>You are not fully grown.</span>")
-		return 0
-=======
 /obj/effect/proc_holder/alien/hide
 	name = "Hide"
 	desc = "Allows aliens to hide beneath tables or certain items. Toggled on or off."
@@ -124,4 +60,3 @@
 	else
 		to_chat(user, "<span class='danger'>You are not fully grown.</span>")
 		return 0
->>>>>>> a479714... Adds missing span-endings (#30494)