fixup merge conflict

diff --git a/CHANGES b/CHANGES
index 46cf85c94ca4155be93e70df8308372dace8bdb6..704739a20e9219b274c4b96fe37fc3826d3566c9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,14 +4,10 @@
                        they fail to validate, we try again in lower case.
                        [RT #27451]
 
-<<<<<<< HEAD
-       --- 9.6-ESV-R7 released ---
-=======
 3328.   [bug]           Fixed inconsistent data checking in dst_parse.c.
                         [RT #29401]
 
-       --- 9.7.6 released ---
->>>>>>> fdfd260... fix check_data() usage
+       --- 9.6-ESV-R7 released ---
 
 3318.  [tuning]        Reduce the amount of work performed while holding a
                        bucket lock when finshed with a fetch context.