Update notes for submitted changes

* Fix merge errors from commit 22a8b59