diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index a8b94d602a4..2a8af560804 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -37,20 +37,15 @@
 			var/mob/M = mob
 			spawn(0) // It's possible that it could be deleted in the meantime, or that it runtimes.
 				if(M)
-<<<<<<< HEAD
-					//VOREStation edit
-					if(istype(M, /mob/observer/dead/))
+					if(isobserver(M))
+						//VOREStation Edit Start
 						var/mob/observer/dead/D = M
 						if(ckey || (src in view(D)))
 							M.show_message(message, m_type)
+							message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
 					else
 						M.show_message(message, m_type)
-					//End VOREStation edit
-=======
-					if(isobserver(M))
-						message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
-					M.show_message(message, m_type)
->>>>>>> 47c1641... Merge pull request #7796 from Atermonera/ghost_emote
+						//VOREStation Edit End
 
 		for(var/obj in o_viewers)
 			var/obj/O = obj