Fixed merge conflict in docs/RELEASE-NOTES.md

pulled from upstream/master and fixed merge conflict