update release note
fix conflict
fix some grammer
update release note
Merge pull request #8870 from minggo/update-release-note

[ci skip]Update release note