added merge tool