Update notes for submitted changes

* mondrianwifi: prima: Fix left over merge conflicts