Fixed merge compile error.