fix merge fail