fixed merge
modified test file
test