diff --git a/telnet.c b/telnet.c
index 9deaf9c0..e415f495 100644
--- a/telnet.c
+++ b/telnet.c
@@ -173,13 +173,8 @@ int TelnetTask(void *pData)
             return 1;
           } else {
             snprintf(pBuffer,sizeof(pBuffer)-1, "Accepted telnet connection on handle %d",
-<<<<<<< HEAD
-                    self->pCon->sockHandle);
-            Log(INFO,"sys","%s",pBuffer);
-=======
 		     SCGetSockHandle(self->pCon));
             Log(INFO,"com","%s",pBuffer);
->>>>>>> conclean
             SendWelcome(self->pCon);
             SCSetRights(self->pCon, iRet);
             self->iLogin = 1;