fix bad NEWS merge
1 file changed