diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80f19fb3..94c1da5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ Changelog
 Unreleased
 ----------
 
+3.1.1
+-----
+
+* Use replace keyword instead of conflict in composer.json
+
 3.1.0
 -----