fix merge compile error