changelog: update

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fc6b28538125c2f104e687cbd3f3b98746d40fe..b0b8dcf4f214df6280c4c5a1d13d356a98a69203 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## unreleased
+- Fix --no-merge. Redmine issue
+  https://redmine.openinfosecfoundation.org/issues/4324.
+
 ## 1.2.0 - 2020-10-05
 - Documentation updates.