fix map conflict
revert to the original version, no split of op1_effect
merge master into current branch
add build_graph function