Update merge tool