Update notes for submitted changes

* Fix fail on user role conflict