diff --git a/src/tls.cpp b/src/tls.cpp
index c125eabc2..d297695cc 100644
--- a/src/tls.cpp
+++ b/src/tls.cpp
@@ -898,10 +898,7 @@ ConnectionType CT_TLS = {
     connTLSSyncWrite,
     connTLSSyncRead,
     connTLSSyncReadLine,
-<<<<<<< HEAD
-=======
     connTLSMarshalThread,
->>>>>>> unstable
 };
 
 int tlsHasPendingData() {