subtree merge
cleanup