diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
index 49c37e957e..d5c94894e9 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
@@ -88,19 +88,9 @@
 	hitsound_wall = 'sound/weapons/effects/searwall.ogg'
 
 
-<<<<<<< HEAD
-/* Close to mid-ranged shooter that arcs over other things, ideal if allies are in front of it.
- Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and
- the projectiles have an AoE component, where as backline hivebots do not. */
-||||||| parent of a923324c11... Merge pull request #10083 from VOREStation/Arokha/langserver
-// Close to mid-ranged shooter that arcs over other things, ideal if allies are in front of it.
-// Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and \
-// the projectiles have an AoE component, where as backline hivebots do not.
-=======
 // Close to mid-ranged shooter that arcs over other things, ideal if allies are in front of it.
 // Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and
 // the projectiles have an AoE component, where as backline hivebots do not.
->>>>>>> a923324c11... Merge pull request #10083 from VOREStation/Arokha/langserver
 /mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline
 	name = "backline hivebot"
 	desc = "A robot that can fire short-ranged projectiles over their allies."