diff --git a/ChangeLog b/ChangeLog
index 70e9bb6..b772c3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -326,7 +326,6 @@
      implementation.
    * Add explicit warnings for the use of MD2, MD4, MD5, SHA-1, DES and ARC4
      throughout the library.
->>>>>>> development
 
 = mbed TLS 2.6.0 branch released 2017-08-10