diff --git a/code/game/verbs/advanced_who.dm b/code/game/verbs/advanced_who.dm
index 75af174d46..4762280a73 100644
--- a/code/game/verbs/advanced_who.dm
+++ b/code/game/verbs/advanced_who.dm
@@ -95,11 +95,5 @@
 	msg += "</table>"
 	msg += "<b>Total Players: [length(Lines)]</b>"
 	msg = "<span class='filter_info'>" + msg + "</span>"
-<<<<<<< HEAD
 	to_chat(src, msg)
 YW EDIT STOP*/
-||||||| parent of 7ea7566f26... Merge pull request #9799 from VOREStation/upstream-merge-7920
-	to_chat(src, msg)
-=======
-	to_chat(src, msg)
->>>>>>> 7ea7566f26... Merge pull request #9799 from VOREStation/upstream-merge-7920