Update notes for submitted changes

* resolve conflicts
* add broadcast interface for channel service