--- a/CHANGELOG	Sun May 27 02:32:58 2018 +0530
+++ b/CHANGELOG	Sun Jun 03 03:35:22 2018 +0530
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+8.1.0 -- in-progress
+---------------------
+
+  * fix `evolve --abort` when `next --evolve` leads to conflicts (issue5897)
+
 8.0.0 -- 2018-04-25
 -------------------