diff --git a/.gitattributes b/.gitattributes
index 412eeda7..81f4fe3a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,3 +20,5 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+/CHANGELOG.md merge=union