diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index db843538ca9..a109804bc56 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -825,6 +825,7 @@
 			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))
@@ -832,6 +833,13 @@
 					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 += "?"
diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm
index 563675d7198..1f00b23f067 100644
--- a/code/modules/mob/living/bot/bot.dm
+++ b/code/modules/mob/living/bot/bot.dm
@@ -287,11 +287,17 @@
 			++frustration
 	return
 
-/mob/living/bot/proc/handleFrustrated(var/targ)
-	obstacle = targ ? target_path[1] : patrol_path[1]
+
+/mob/living/bot/proc/handleFrustrated(has_target)
+	obstacle = null
+	if (has_target)
+		if (length(target_path))
+			obstacle = target_path[1]
+	else if (length(patrol_path))
+		obstacle = patrol_path[1]
 	target_path = list()
 	patrol_path = list()
-	return
+
 
 /mob/living/bot/proc/lookForTargets()
 	return
diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm
index 0f851d6dd58..02638226bf4 100644
--- a/code/modules/mob/living/bot/mulebot.dm
+++ b/code/modules/mob/living/bot/mulebot.dm
@@ -187,7 +187,7 @@
 		flick("mulebot-emagged", src)
 	update_icons()
 
-/mob/living/bot/mulebot/handleFrustrated()
+/mob/living/bot/mulebot/handleFrustrated(has_target)
 	custom_emote(2, "makes a sighing buzz.")
 	playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
 	..()