diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..ef9566b29
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/CHANGELOG.md merge=union
\ No newline at end of file