diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 2fe113908d2..99d56623b3c 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -566,7 +566,6 @@
else
ip_reputation = score
return TRUE
-<<<<<<< HEAD
/client/proc/disconnect_with_message(var/message = "You have been intentionally disconnected by the server.
This may be for security or administrative reasons.")
message = "You Have Been Disconnected
[message]
If you feel this is in error, you can contact an administrator out-of-game (for example, on Discord)."
@@ -618,5 +617,3 @@
else
winset(usr, "input", "is-visible=false")
*/
-=======
->>>>>>> e2553d4fb15... Merge pull request #8907 from Cerebulon/grammargrabbag