Update notes for submitted changes

* Remove conflict marker, fix whitespace