added notes for bug fix 2
bug fix complete
reslove merge conflict
completed coding