Update notes for submitted changes

* Move handle_conflicts decorator into sql