"basic test done"
add test.sh
solve merge