master fixd bug
resolve merge conflict
add notes completed coding