added list in master
committing after resolving conflicts
added notes span