Update notes for submitted changes

* Calculator: fix merge fail