Update notes for submitted changes

* Removing conflict