made change from master branch
resolve merge conflict
added noted complted coding