Small fixes in merge.cpp
New tools