diff --git a/CHANGES b/CHANGES
index e37861e99..01f810cd4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Release 1.6 (in development)
 ============================