Update notes for submitted changes

* Preserve merges when doing a rebase