Changed path in releasenotes
Fixed merge conflict in changelog