added a comment
merge conflict fixed
test statements added