diff --git a/.gitattributes b/.gitattributes
index 67ef805aada..82ee767d306 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,6 @@
 # line endings.
 /fbw-a32nx/src/localization/flypad/*.json text eol=lf
 /fbw-a32nx/src/localization/msfs/*.locPak text eol=lf
+
+# try to deconflict changelog
+.github/CHANGELOG.md merge=union