diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 3dab3135cf0..0ae3fd17b9d 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -86,11 +86,7 @@
 	update_icon()
 
 
-<<<<<<< HEAD
 /obj/item/device/taperecorder/hear_talk(mob/M, list/message_pieces, verb)
-=======
-/obj/item/taperecorder/hear_talk(mob/living/M, list/message_pieces, verb)
->>>>>>> 46c088f9e84... Fixing Tape Recorder Voices (#8950)
 	var/msg = multilingual_to_message(message_pieces, requires_machine_understands = TRUE, with_capitalization = TRUE)
 	var/voice = M.GetVoice() //Defined on living, returns name for normal mobs/
 	if(mytape && recording)
@@ -437,4 +433,4 @@
 
 //Random colour tapes
 /obj/item/device/tape/random/New()
-	icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
\ No newline at end of file
+	icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"