fix merge conflict in NEWS

Authored by mqualmann on Jun 20 2018, 5:35 PM.