diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index a04ec31eeb..ed7beee2b4 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -663,13 +663,8 @@
 		return
 
 	//roll to-hit
-<<<<<<< HEAD
 	miss_modifier = max(miss_modifier + target_mob.get_evasion(), -100) //CHOMPEDIT - removing baymiss
-	var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss
-=======
-	miss_modifier = max(15*(distance-2) - accuracy + miss_modifier + target_mob.get_evasion(), -100)
 	var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob), force_hit = !can_miss) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss
->>>>>>> 4b43b02c06... Merge pull request #13193 from Heroman3003/traitening
 
 	var/result = PROJECTILE_FORCE_MISS
 	if(hit_zone)