diff --git a/.gitattributes b/.gitattributes
index c3c47756..b003cbb6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,3 +17,5 @@
 # Exclude vendored code from project language stats
 warp/native/cutlass/** linguist-vendored
 tools/** linguist-vendored
+
+CHANGELOG.md merge=union
\ No newline at end of file