fix compile error due to failed merge