diff --git a/ChangeLog b/ChangeLog
index 01bdb22d4..88e2bc92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,6 @@ mbed TLS ChangeLog (Sorted per branch, date)
 = mbed TLS x.x.x branch released xxxx-xx-xx
 
 Bugfix
-<<<<<<< HEAD
    * Fix the redefinition of macro ssl_set_bio to an undefined symbol
      mbedtls_ssl_set_bio_timeout in compat-1.3.h, by removing it.
      Found by omlib-lin. #673