diff -r f1466f5ffbf5 -r 313565dd75e3 CHANGELOG
--- a/CHANGELOG	Sun Dec 23 01:02:36 2018 +0800
+++ b/CHANGELOG	Fri Jun 07 18:14:48 2019 +0800
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+9.0.1 - in progress
+-------------------
+
+  * pick: no longer forget file in case of conflict (issue6037)
+
 9.0.0 -- 2019-06-06
 -------------------