Update notes for submitted changes

* Adjust == conflicts