updated comments
test
updated comments
fixed merge conflict