- merge compile error fix