Update notes for submitted changes

* fix conflicts