diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 8b035de0b5..45838de5e7 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -615,9 +615,6 @@
 			to_chat(M, "<span class = 'warning'>Your eyes sting!</span>")
 			M.blind_eyes(2)
 
-
-<<<<<<< HEAD
-=======
 /datum/reagent/consumable/nutriment/stabilized
 	name = "Stabilized Nutriment"
 	id = "stabilizednutriment"
@@ -630,8 +627,7 @@
 	if(M.nutrition > NUTRITION_LEVEL_FULL - 25)
 		M.nutrition -= 3*nutriment_factor
 	..()
-
->>>>>>> 8637339... Nutriment can get you fat again.
+	
 ////Lavaland Flora Reagents////
 
 
@@ -689,4 +685,4 @@
 	description = "The sorrow and melancholy of a thousand bereaved clowns, forever denied their Honkmechs."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#eef442" // rgb: 238, 244, 66
-	taste_description = "mournful honking"
\ No newline at end of file
+	taste_description = "mournful honking"