diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/kitchen/cooking_machines/oven.dm
index 788e0a8432..d58df7e6f6 100644
--- a/code/modules/food/kitchen/cooking_machines/oven.dm
+++ b/code/modules/food/kitchen/cooking_machines/oven.dm
@@ -104,11 +104,7 @@
 		cooking = FALSE
 
 	playsound(src, 'sound/machines/hatch_open.ogg', 20, 1)
-<<<<<<< HEAD
-	to_chat(user, "<span class='notice'>You [open ? "open" : "close"] the oven door.</span>")
-=======
 	to_chat(user, "<span class='notice'>You [open? "open":"close"] the oven door</span>")
->>>>>>> 65f48cd... Merge pull request #7845 from Cerebulon/foodfixes
 	update_icon()
 
 /obj/machinery/appliance/cooker/oven/proc/manip(var/obj/item/I)
@@ -156,4 +152,4 @@
 		combination_cook(CI)
 		return
 	else
-		..()
\ No newline at end of file
+		..()