diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm
index f48d51edb6..b1533ed5f4 100644
--- a/code/modules/client/verbs/who.dm
+++ b/code/modules/client/verbs/who.dm
@@ -65,223 +65,6 @@
 	var/num_admins_online = 0
 	var/num_devs_online = 0
 	var/num_event_managers_online = 0
-<<<<<<< HEAD
-
-	if(holder)
-		for(var/client/C in GLOB.admins)
-			if(R_ADMIN & C.holder.rights && R_BAN & C.holder.rights)
-
-				if(C.holder.fakekey && !((R_ADMIN & holder.rights) || (R_MOD & holder.rights)))		//Event Managerss can't see stealthmins
-					continue
-
-				msg += "\t[C] is a [C.holder.rank]"
-
-				if(C.holder.fakekey)
-					msg += " <i>(as [C.holder.fakekey])</i>"
-
-				if(isobserver(C.mob))
-					msg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
-					msg += " - Lobby"
-				else
-					msg += " - Playing"
-
-				if(C.is_afk())
-					var/seconds = C.last_activity_seconds()
-					msg += " (AFK - "
-					msg += "[round(seconds / 60)] minutes, "
-					msg += "[seconds % 60] seconds)"
-				msg += "\n"
-
-				num_admins_online++
-			else if(R_MOD & C.holder.rights && !(R_SERVER & C.holder.rights))
-				modmsg += "\t[C] is a [C.holder.rank]"
-
-				if(C.holder.fakekey && !((R_ADMIN & holder.rights) || (R_MOD & holder.rights)))
-					continue
-				if(C.holder.fakekey)
-					msg += " <i>(as [C.holder.fakekey])</i>"
-
-				if(isobserver(C.mob))
-					modmsg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
-					modmsg += " - Lobby"
-				else
-					modmsg += " - Playing"
-
-				if(C.is_afk())
-					var/seconds = C.last_activity_seconds()
-					modmsg += " (AFK - "
-					modmsg += "[round(seconds / 60)] minutes, "
-					modmsg += "[seconds % 60] seconds)"
-				modmsg += "\n"
-				num_mods_online++
-
-			else if(R_SERVER & C.holder.rights)
-				if(C.holder.fakekey && !((R_ADMIN & holder.rights) || (R_MOD & holder.rights)))
-					continue
-				devmsg += "\t[C] is a [C.holder.rank]"
-				if(C.holder.fakekey)
-					devmsg += " <i>(as [C.holder.fakekey])</i>"
-				if(isobserver(C.mob))
-					devmsg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
-					devmsg += " - Lobby"
-				else
-					devmsg += " - Playing"
-
-				if(C.is_afk())
-					var/seconds = C.last_activity_seconds()
-					devmsg += "(AFK - "
-					devmsg += "[round(seconds / 60)] minutes, "
-					devmsg += "[seconds % 60] seconds)"
-				devmsg += "\n"
-				num_devs_online++
-
-			else
-				if(C.holder.fakekey && !((R_ADMIN & holder.rights) || (R_MOD & holder.rights)))
-					continue
-				eventMmsg += "\t[C] is a [C.holder.rank]"
-				if(C.holder.fakekey)
-					eventMmsg += " <i>(as [C.holder.fakekey])</i>"
-				if(isobserver(C.mob))
-					eventMmsg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
-					eventMmsg += " - Lobby"
-				else
-					eventMmsg += " - Playing"
-
-				if(C.is_afk())
-					var/seconds = C.last_activity_seconds()
-					eventMmsg += " (AFK - "
-					eventMmsg += "[round(seconds / 60)] minutes, "
-					eventMmsg += "[seconds % 60] seconds)"
-				eventMmsg += "\n"
-				num_event_managers_online++
-
-	else
-		for(var/client/C in GLOB.admins)
-			if(R_ADMIN & C.holder.rights && R_BAN & C.holder.rights)
-				if(!C.holder.fakekey)
-					msg += "\t[C] is a [C.holder.rank]\n"
-					num_admins_online++
-			else if(R_MOD & C.holder.rights && !(R_SERVER & C.holder.rights))	//YW EDIT
-				if(!C.holder.fakekey)
-					modmsg += "\t[C] is a [C.holder.rank]\n"
-					num_mods_online++
-			else if(R_SERVER & C.holder.rights)
-				if(!C.holder.fakekey)
-					devmsg += "\t[C] is a [C.holder.rank]\n"
-					num_devs_online++
-||||||| parent of c8e037812d... Merge pull request #10682 from VOREStation/upstream-merge-8143
-	
-	if(holder)
-		for(var/client/C in GLOB.admins)
-			if(R_ADMIN & C.holder.rights && R_BAN & C.holder.rights)
-
-				if(C.holder.fakekey && !((R_ADMIN & holder.rights) || (R_MOD & holder.rights)))		//Event Managerss can't see stealthmins
-					continue
-
-				msg += "\t[C] is a [C.holder.rank]"
-
-				if(C.holder.fakekey)
-					msg += " <i>(as [C.holder.fakekey])</i>"
-
-				if(isobserver(C.mob))
-					msg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
-					msg += " - Lobby"
-				else
-					msg += " - Playing"
-
-				if(C.is_afk())
-					var/seconds = C.last_activity_seconds()
-					msg += " (AFK - "
-					msg += "[round(seconds / 60)] minutes, "
-					msg += "[seconds % 60] seconds)"
-				msg += "\n"
-
-				num_admins_online++
-			else if(R_ADMIN & C.holder.rights && !(R_SERVER & C.holder.rights))
-				modmsg += "\t[C] is a [C.holder.rank]"
-
-				if(C.holder.fakekey && !((R_ADMIN & holder.rights) || (R_MOD & holder.rights)))
-					continue
-				if(C.holder.fakekey)
-					msg += " <i>(as [C.holder.fakekey])</i>"
-
-				if(isobserver(C.mob))
-					modmsg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
-					modmsg += " - Lobby"
-				else
-					modmsg += " - Playing"
-
-				if(C.is_afk())
-					var/seconds = C.last_activity_seconds()
-					modmsg += " (AFK - "
-					modmsg += "[round(seconds / 60)] minutes, "
-					modmsg += "[seconds % 60] seconds)"
-				modmsg += "\n"
-				num_mods_online++
-
-			else if(R_SERVER & C.holder.rights)
-				if(C.holder.fakekey && !((R_ADMIN & holder.rights) || (R_MOD & holder.rights)))
-					continue
-				devmsg += "\t[C] is a [C.holder.rank]"
-				if(C.holder.fakekey)
-					devmsg += " <i>(as [C.holder.fakekey])</i>"
-				if(isobserver(C.mob))
-					devmsg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
-					devmsg += " - Lobby"
-				else
-					devmsg += " - Playing"
-
-				if(C.is_afk())
-					var/seconds = C.last_activity_seconds()
-					devmsg += "(AFK - "
-					devmsg += "[round(seconds / 60)] minutes, "
-					devmsg += "[seconds % 60] seconds)"
-				devmsg += "\n"
-				num_devs_online++
-
-			else
-				if(C.holder.fakekey && !((R_ADMIN & holder.rights) || (R_MOD & holder.rights)))
-					continue
-				eventMmsg += "\t[C] is a [C.holder.rank]"
-				if(C.holder.fakekey)
-					eventMmsg += " <i>(as [C.holder.fakekey])</i>"
-				if(isobserver(C.mob))
-					eventMmsg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
-					eventMmsg += " - Lobby"
-				else
-					eventMmsg += " - Playing"
-
-				if(C.is_afk())
-					var/seconds = C.last_activity_seconds()
-					eventMmsg += " (AFK - "
-					eventMmsg += "[round(seconds / 60)] minutes, "
-					eventMmsg += "[seconds % 60] seconds)"
-				eventMmsg += "\n"
-				num_event_managers_online++
-
-	else
-		for(var/client/C in GLOB.admins)
-			if(R_ADMIN & C.holder.rights && R_BAN & C.holder.rights)
-				if(!C.holder.fakekey)
-					msg += "\t[C] is a [C.holder.rank]\n"
-					num_admins_online++
-			else if(R_ADMIN & C.holder.rights && !(R_SERVER & C.holder.rights))
-				if(!C.holder.fakekey)
-					modmsg += "\t[C] is a [C.holder.rank]\n"
-					num_mods_online++
-			else if(R_SERVER & C.holder.rights)
-				if(!C.holder.fakekey)
-					devmsg += "\t[C] is a [C.holder.rank]\n"
-					num_devs_online++
-=======
 	for(var/client/C in GLOB.admins) // VOREStation Edit - GLOB
 		var/temp = ""
 		var/category = R_ADMIN
@@ -310,7 +93,6 @@
 				temp += " - Observing"
 			else if(istype(C.mob,/mob/new_player))
 				temp += " - Lobby"
->>>>>>> c8e037812d... Merge pull request #10682 from VOREStation/upstream-merge-8143
 			else
 				temp += " - Playing"