diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index d13a1d9e2..a20f77b17 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -641,11 +641,8 @@ void CL_AddSplitscreenPlayer(void);
 void CL_RemoveSplitscreenPlayer(UINT8 p);
 void CL_Reset(void);
 void CL_ClearPlayer(INT32 playernum);
-<<<<<<< HEAD
 void CL_RemovePlayer(INT32 playernum, INT32 reason);
-=======
 void CL_QueryServerList(msg_server_t *list);
->>>>>>> srb2/next
 void CL_UpdateServerList(boolean internetsearch, INT32 room);
 // Is there a game running
 boolean Playing(void);