fixed compile error in include
merge conflict