merge more changes from the leaves