Update notes for submitted changes

* fix nova-network vs. openstack-network conflict