diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 3abf98960e..f1805fd16c 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -2,15 +2,10 @@
  * Pulse Rifle
  */
 /obj/item/weapon/gun/energy/pulse_rifle
-<<<<<<< HEAD
-	name = "pulse rifle"
-	desc = "A weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. Because of its complexity and cost, it is rarely seen in use except by specialists."
-	icon = 'icons/obj/gun.dmi' // CHOMPEdit: Gun Sprites
-=======
 	name = "\improper LP1 Locust Rifle"
 	desc = "The Bishamonten LP1 is a weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. \
 	Because of its complexity and cost, it is rarely seen in use except by specialists."
->>>>>>> a91e034c03... Merge pull request #12686 from GhostActual/gun-revmap-2022
+	icon = 'icons/obj/gun.dmi' // CHOMPEdit: Gun Sprites
 	icon_state = "pulse"
 	item_state = null	//so the human update icon uses the icon_state instead.
 	slot_flags = SLOT_BELT|SLOT_BACK
@@ -87,4 +82,4 @@
 		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_delay=null, charge_cost = 240),
 		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_delay=null, charge_cost = 240),
 		list(mode_name="DESTROY", projectile_type=/obj/item/projectile/beam/pulse, fire_delay=null, charge_cost = 480),
-		)
\ No newline at end of file
+		)