diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 0484ea3413..36cff4da2c 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -77,33 +77,6 @@
 // message is the message output to anyone who can see e.g. "[src] does something!"
 // self_message (optional) is what the src mob sees  e.g. "You do something!"
 // blind_message (optional) is what blind people will hear e.g. "You hear something!"
-<<<<<<< HEAD
-/mob/visible_message(var/message, var/self_message, var/blind_message)
-
-	//VOREStation Edit
-	var/list/see
-	if(isbelly(loc))
-		var/obj/belly/B = loc
-		see = B.get_mobs_and_objs_in_belly()
-	else
-		see = get_mobs_and_objs_in_view_fast(get_turf(src),world.view,remote_ghosts = FALSE)
-	//VOREStation Edit End
-
-	var/list/seeing_mobs = see["mobs"]
-	var/list/seeing_objs = see["objs"]
-
-	for(var/obj in seeing_objs)
-		var/obj/O = obj
-		O.show_message(message, 1, blind_message, 2)
-	for(var/mob in seeing_mobs)
-		var/mob/M = mob
-		if(self_message && M == src)
-			M.show_message( self_message, 1, blind_message, 2)
-		else if(M.see_invisible >= invisibility && MOB_CAN_SEE_PLANE(M, plane))
-			M.show_message(message, 1, blind_message, 2)
-		else if(blind_message)
-			M.show_message(blind_message, 2)
-=======
 /mob/visible_message(var/message, var/self_message, var/blind_message, var/list/exclude_mobs = null)
 	if(self_message)
 		if(LAZYLEN(exclude_mobs))
@@ -112,7 +85,6 @@
 			exclude_mobs = list(src)
 		src.show_message(self_message, 1, blind_message, 2)
 	. = ..()
->>>>>>> 5714d64... Actually adds (and TESTS) exclude_mobs parameter to visible_message (#7555)
 
 // Returns an amount of power drawn from the object (-1 if it's not viable).
 // If drain_check is set it will not actually drain power, just return a value.
@@ -1237,4 +1209,4 @@ GLOBAL_LIST_EMPTY(living_players_by_zlevel)
 
 /mob/proc/grab_ghost(force)
 	if(mind)
-		return mind.grab_ghost(force = force)
\ No newline at end of file
+		return mind.grab_ghost(force = force)