diff --git a/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py b/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
index 6b065d82..578a9ef7 100644
--- a/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
+++ b/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
@@ -236,11 +236,7 @@ class PlayerSpaz(Spaz):
                     and bs.time() - self.last_attacked_time < 4.0
                 )
                 # Immediate-mode or left-game deaths don't count as 'kills'.
-<<<<<<< HEAD
                 killed = bool(
-=======
-                killed = (
->>>>>>> 1a42c50052a4f63e119d13e5bdd05d3b71498bf3
                     not msg.immediate
                     and msg.how is not bs.DeathType.LEFT_GAME
                     or was_held