diff --git a/.gitattributes b/.gitattributes
index d8ee5cbbb3e..5570b4b34ec 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,4 +21,4 @@ sapi/nsapi/nsapi.c              ident
 sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
-NEWS                            merge=ours
+NEWS                            merge=NEWS