--- a/CHANGELOG	Fri Jun 07 02:25:02 2019 +0200
+++ b/CHANGELOG	Thu Jun 06 17:37:42 2019 +0800
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+9.1.0 - in progress
+-------------------
+
+  * evolve: use the same wording as core in case of unresolved conflict
+
 9.0.0 -- 2019-06-06
 -------------------