Update notes for submitted changes

* make merge conflict changes black
Update notes for submitted changes

* clean up possible js incompatibilities