Update notes for submitted changes

* resolve conflicts