Fix rebase problem in Tree.cpp