re-fix conficts

correcting mistakes in the merging process

code/modules/mob/living/carbon/xenomorph/Xenomorph.dm

@@ -1113,16 +1113,3 @@
 	SPAN_WARNING("You squeeze and scuttle underneath [current_structure]."), max_distance = 2)
 	forceMove(current_structure.loc)
 	return TRUE
-
-///Generate a new unused nicknumber for the current hive, if hive doesn't exist return 0
-/mob/living/carbon/xenomorph/proc/generate_and_set_nicknumber()
-	if(!hive)
-		//If hive doesn't exist make it 0
-		nicknumber = 0
-		return
-	var/datum/hive_status/hive_status = hive
-	if(length(hive_status.available_nicknumbers))
-		nicknumber = pick_n_take(hive_status.available_nicknumbers)
-	else
-		//If we somehow use all 999 numbers fallback on 0
-		nicknumber = 0

code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm

@@ -96,7 +96,7 @@
 	if(stun_power)
 		carbone.Stun(get_xeno_stun_duration(carbone, stun_power))
 	if(weaken_power)
-		carbone.KnockDown(get_xeno_stun_duration(carbon, weaken_power))
+		carbone.KnockDown(get_xeno_stun_duration(carbone, weaken_power))
 	if(slowdown)
 		if(carbone.slowed < slowdown)
 			carbone.apply_effect(slowdown, SLOW)