Added release notes
updated release notes
fixed stupid conflict