bug is fixed
resolve merge conflict
added notes,completed coding