fix merge fails