..........

code/modules/antagonists/space_ninja/space_ninja.dm

@@ -85,7 +85,7 @@
 	var/datum/objective/plant_explosive/bombobjective = new /datum/objective/plant_explosive()
 	for(var/sanity in 1 to 100) // 100 checks at most.
 		var/area/selected_area = pick(GLOB.sortedAreas)
-		if(!is_station_level(selected_area.z) || !selected_area.valid_territory)
+		if(!is_station_level(selected_area.z) || !selected_area.area_flags == VALID_TERRITORY)
 			continue
 		bombobjective.detonation_location = selected_area
 		break

code/modules/ninja/suit/ninjaDrainAct.dm

@@ -317,15 +317,11 @@
 		DefaultCombatKnockdown(ninja_gloves.stunforce, override_hardstun = 0)
 		apply_effect(EFFECT_STUTTER, ninja_gloves.stunforce)
 		SEND_SIGNAL(src, COMSIG_LIVING_MINOR_SHOCK)
-
-<<<<<<< HEAD
 		lastattacker = ninja.real_name
 		lastattackerckey = ninja.ckey
 		log_combat(ninja, src, "stunned")
-=======
-		set_last_attacker(H)
-		log_combat(H, src, "stunned")
->>>>>>> 6887e2d097b9ba361e455deccb57c6ac35c8fc79
+		set_last_attacker(ninja)
+		log_combat(ninja, src, "stunned")
 
 		playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)