bug fix
resolve merge conflict
added notes,completed coding