diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
index cde88d74b8..fd691c65cb 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
@@ -52,7 +52,6 @@
 	if(istype(thing, /obj/item/stack/material))
 		var/obj/item/stack/material/M = thing
 		var/datum/material/mat = M.get_material()
-<<<<<<< HEAD
 		if(!blitzprogress)
 			if(!mat.is_fusion_fuel)
 				to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
@@ -67,7 +66,7 @@
 				to_chat(user, "<span class='warning'>You need at least 25 [mat.sheet_plural_name] to make a fuel rod.</span>")
 				return
 			var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
-			visible_message("<span class='notice'>\The [src] compresses the [mat.use_name] into a new fuel assembly.</span>")
+			visible_message("<b>\The [src]</b> compresses \the [thing] into a new fuel assembly.")
 			M.use(FUSION_ROD_SHEET_AMT)
 			user.put_in_hands(F)
 		else
@@ -84,29 +83,6 @@
 			else
 				to_chat(user, "<span class='warning'>A blitz rod is currently in progress! Either add 25 phoron sheets to complete it, or eject the supermatter sheet!</span>")
 				return
-||||||| parent of e4b8407fdb... Merge pull request #10908 from MarinaGryphon/spannening
-		if(!mat.is_fusion_fuel)
-			to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
-			return
-		if(M.get_amount() < FUSION_ROD_SHEET_AMT)
-			to_chat(user, "<span class='warning'>You need at least 25 [mat.sheet_plural_name] to make a fuel rod.</span>")
-			return
-		var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
-		visible_message("<span class='notice'>\The [src] compresses the [mat.use_name] into a new fuel assembly.</span>")
-		M.use(FUSION_ROD_SHEET_AMT)
-		user.put_in_hands(F)
-=======
-		if(!mat.is_fusion_fuel)
-			to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
-			return
-		if(M.get_amount() < FUSION_ROD_SHEET_AMT)
-			to_chat(user, "<span class='warning'>You need at least 25 [mat.sheet_plural_name] to make a fuel rod.</span>")
-			return
-		var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
-		visible_message("<b>\The [src]</b> compresses the [mat.use_name] into a new fuel assembly.")
-		M.use(FUSION_ROD_SHEET_AMT)
-		user.put_in_hands(F)
->>>>>>> e4b8407fdb... Merge pull request #10908 from MarinaGryphon/spannening
 
 	else if(do_special_fuel_compression(thing, user))
 		return