fixed bug
resolve merge conflict
added notes in index