Update CONTRIBUTING.md

Warn users against adding their release notes to news.html since that
always causes merge conflicts.