Update notes for submitted changes

* Handle some divergence cases