Update notes for submitted changes

* Handle strict version conflicts correctly