Update notes for submitted changes

* Dropped a git conflict marker that snuck in