Update notes for submitted changes

* Merge collision inevitable