Update notes for submitted changes

* removing remaining file of a conflict resolving