diff --git a/.gitattributes b/.gitattributes
index 9079692dc..f0e8588ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@
 *.ps1 eol=crlf
 *.cmd eol=crlf
 ReadMe.md merge=ours
+ChangeLog.md merge=ours