resolve conflict
Merge branch 'master' of https://github.com/fredfeng/Scuba
do not simplify in union and intersection.
dbg cst
Merge branch 'master' of https://github.com/fredfeng/Scuba