diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 10d444afd22..96e4ca9d29f 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -183,8 +183,6 @@ obj/item/ammo_casing/energy/net
 	e_cost = 200
 	select_name = "stun"
 	projectile_type = /obj/item/projectile/energy/shock_revolver
-<<<<<<< HEAD
-
 
 /obj/item/ammo_casing/energy/gravipulse
 	projectile_type = /obj/item/projectile/gravipulse
@@ -200,5 +198,3 @@ obj/item/ammo_casing/energy/net
 /obj/item/ammo_casing/energy/gravipulse/alt
 	projectile_type = /obj/item/projectile/gravipulse/alt
 	select_name = "attract"
-=======
->>>>>>> refs/remotes/tgstation/master