fixed merge conflicts in test.sh