diff --git a/examples/client/client.c b/examples/client/client.c
index 908ae61af..0e6b0c5cc 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -1183,7 +1183,6 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
                 #endif
                 break;
 
-<<<<<<< HEAD
             case 'J' :
                 #ifdef WOLFSSL_TLS13
                     helloRetry = 1;