diff --git a/ChangeLog b/ChangeLog
index d66013f5..36bd6494 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,10 +68,7 @@
 - png save compression range was wrong
 - more/moreeq was wrong
 - vips7 ppm save with options was broken 
-<<<<<<< HEAD
-=======
 - don't cache write operations
->>>>>>> origin/master
 
 18/6/12 started 7.28.9
 - slightly more memory debugging output