diff --git a/.gitattributes b/.gitattributes
index 61d299b53..798030e35 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,6 @@
 *.py text eol=lf
 *.sh text eol=lf
+
+# CHANGELOG appends conflict on nearly every concurrent PR; union-merge keeps
+# all entries instead of forcing a manual resolution, killing the merge cascade.
+CHANGELOG.md merge=union