fix merge regression