change main.cpp and generated new tree
merged