fixed a compile error from merge conflict.