diff --git a/CHANGELOG.md b/CHANGELOG.md
index a715533bac..0b863c3b5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Modification for mercurial repositories with enabled XSRF protection
+- Does not throw NullPointerException when merge fails without normal merge conflicts
 
 ### Removed
 - Enunciate rest documentation