Fixed compiling errors.
merge conflict