fix merge script