fix merge tool