Tool.cpp change
merge