fix merge merge fail