diff --git a/.gitattributes b/.gitattributes
index 026167bb..36231ea1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@
 *.sln text eol=crlf
 *.csproj text eol=crlf
 *.vsmdi text eol=crlf
+CHANGELOG.md merge=union