diff --git a/.gitattributes b/.gitattributes
index d8e9a4c73df..0d611d32058 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,3 @@ gradlew eol=lf
 # ensure that line endings of *.java and *.properties are normalized
 *.properties text
 *.java text
-
-# ensure that CHANGELOG entries are merged instead of causing conflicts
-CHANGELOG.md merge=union