diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..fefd5dc5b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+core/CHANGELOG.md merge=union
+python/CHANGELOG.md merge=union
+legacy/firmware/CHANGELOG.md merge=union
+legacy/bootloader/CHANGELOG.md merge=union