diff --git a/.gitattributes b/.gitattributes
index f02f9636b36b..2c1aaba4dec0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
-CHANGELOG.md  merge=union
-CHANGELOG.asciidoc  merge=union
+CHANGELOG.next.asciidoc  merge=union
+CHANGELOG-developer.next.asciidoc  merge=union
 
 # Keep these file types as CRLF (Windows).
 *.bat    text eol=crlf