fix and test

in execute, even resolveConflict fails, we should try to execute
anyway, because there may be a complete scc in sccResult

add test.sh and build.sh