.gitattributes to set merge strategy to "union" for NEWS.md
add NEWS item