diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index a109804bc56..fef72548c2c 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -825,21 +825,11 @@
 			else if(has_item_product)
 				product = new has_item_product(get_turf(user))
 			else
-<<<<<<< HEAD
 				product = new /obj/item/weapon/reagent_containers/food/snacks/grown(get_turf(user),name)
-			if(get_trait(TRAIT_PRODUCT_COLOUR))
-				if(!istype(product, /mob))
-					product.color = get_trait(TRAIT_PRODUCT_COLOUR)
-					if(istype(product,/obj/item/weapon/reagent_containers/food))
-						var/obj/item/weapon/reagent_containers/food/food = product
-						food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR)
-=======
-				product = new /obj/item/reagent_containers/food/snacks/grown(get_turf(user),name)
 			if (get_trait(TRAIT_PRODUCT_COLOUR))
 				if (istype(product,/obj/item/reagent_containers/food))
 					var/obj/item/reagent_containers/food/food = product
 					food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR)
->>>>>>> 29546fd08fa... Merge pull request #8735 from Spookerton/spkrtn/fix/8703-8733
 
 			if(mysterious)
 				product.name += "?"