fix merge failures