diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 9bca60208..e3034c09c 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -759,7 +759,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 		}
 		else
         {
-<<<<<<< HEAD
 			UINT16 chatcolor = skincolors[players[playernum].skincolor].chatcolor;
 
 			if (!chatcolor || chatcolor%0x1000 || chatcolor>V_INVERTMAP)