diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 5441309e055a..a864f26b367e 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -4024,10 +4024,7 @@ int mbedtls_ssl_handshake_client_step_tls1_3( mbedtls_ssl_context *ssl )
             ret = MBEDTLS_ERR_SSL_RECEIVED_NEW_SESSION_TICKET;
             break;
 #endif /* MBEDTLS_SSL_NEW_SESSION_TICKET */
-<<<<<<< HEAD
-=======
 
->>>>>>> fix build and test fail without ticket and cookie
         /*
          * Injection of dummy-CCS's for middlebox compatibility
          */
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index cb46a7d574bc..efb1622c2a05 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -1518,7 +1518,6 @@ static int ssl_populate_session_tls12( mbedtls_ssl_session *session,
 }
 #endif /* MBEDTLS_SSL_NEW_SESSION_TICKET */
 
-#endif /* MBEDTLS_SSL_NEW_SESSION_TICKET */
 /*
  * Perform data exchanging between \p ssl_1 and \p ssl_2 and check if the
  * message was sent in the correct number of fragments.