diff --git a/code/modules/projectiles/guns/energy/netgun_vr.dm b/code/modules/projectiles/guns/energy/netgun_vr.dm
index 85f90690ee..0baa5f1421 100644
--- a/code/modules/projectiles/guns/energy/netgun_vr.dm
+++ b/code/modules/projectiles/guns/energy/netgun_vr.dm
@@ -1,22 +1,10 @@
 //Contains the Energy Net Gun code and information/lore
 
 /obj/item/weapon/gun/energy/netgun
-<<<<<<< HEAD
-	name = "\"Varmint Catcher\" energy net gun"
+	name = "energy net gun"
 	desc = "A Hephaestus-designed, usually dubbed 'non-lethal capture device' energy net launcher, \
 			for when you wanna capture feracious predators." //YW edit - small change to description
-	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
-||||||| parent of 7f5d51a928... Merge pull request #10729 from klaasjared/Netgun-Upgrade
-	name = "energy net gun"
-	desc = "Specially made-to-order by Xenonomix, the XX-1 \"Varmint Catcher\" is designed to trap even the most unruly of creatures for safe transport."
-=======
-	name = "energy net gun"
-	desc = "Specially made-to-order by Xenonomix, the  \"Varmint Catcher\" is designed to trap even the most unruly of creatures for safe transport."
-	description_fluff = "The Xenonomix Brand XX-1 Energy Net Cannon is a marvel of technology that is used heavily by several departments within NanoTrasen. \
-	Whether by scientific departments when capturing specimens on alien worlds to study or by security forces to detain unruly crew, NanoTrasen is deeply \
-	appreciative of the \"Varmint Catcher\" Netgun System. WARNING!: Xenonomix and NanoTrasen are not responsible for any injuries caused by the device \
-	in any aspect, thank you for understanding."
->>>>>>> 7f5d51a928... Merge pull request #10729 from klaasjared/Netgun-Upgrade
+	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus) //CHOMP Edit? Probably YW actually. Replaces Virgo lore.
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "netgun"
 	item_state = "gun" // Placeholder
@@ -52,4 +40,4 @@
 		if(modifystate)
 			icon_state = "[modifystate]"
 		else
-			icon_state = "[initial(icon_state)]"
\ No newline at end of file
+			icon_state = "[initial(icon_state)]"