resolve merge conflict and update readme
added notes. completed conding