fix compile error from merge