fix compile error introduced by undeleted code when merge code conflict