updated release notes
conflict