diff --git a/CHANGES b/CHANGES
index 46323693ac5..c65607c24fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Release 3.0.0 (in development)
 ==============================