diff --git a/.gitattributes b/.gitattributes
index a51376f0d..2850eb3b1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,6 +17,13 @@
 
 .vscode/*.json linguist-language=JSON-with-Comments
 
+# Configure changelog files to use union merge strategy
+# This prevents merge conflicts by automatically combining changes from both branches
+CHANGELOG.md merge=union
+changelog.md merge=union
+CHANGELOG.txt merge=union
+changelog.txt merge=union
+
 *.raw    binary
 *.bin    binary
 *.png    binary