diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d63406b65c1d466c69cd6e90593bc8ce3095734..89a998e7b8b2e8997bdf333f83cda2463de4219a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added ###
 
+* `apiutils.EntityMergeConflictError` class for unresesolvable merge conflicts
+  when merging two entities
+
 ### Changed ###
 
+* `apiutils.merge_entities` now raises an `EntityMergeConflictError` in case of
+  unresolvable merge conflicts.
+
 ### Deprecated ###
 
 ### Removed ###