diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index b2f01212f5..853cca2057 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -85,8 +85,6 @@
 		playsound(user, 'sound/weapons/blade1.ogg', 50, 1)
 		target.emag_act(user)
 
-<<<<<<< HEAD
-=======
 /obj/item/energy_katana/pickup(mob/living/user)
 	. = ..()
 	jaunt.Grant(user, src)
@@ -97,7 +95,6 @@
 	. = ..()
 	jaunt.Remove(user)
 	user.update_icons()
->>>>>>> 4ffb1cd... Merge pull request #31289 from ShizCalev/hacknslash
 
 //If we hit the Ninja who owns this Katana, they catch it.
 //Works for if the Ninja throws it or it throws itself or someone tries