Update NEWS
Update NEWS
solve conflicts after merge