fix the require directory
Merge branch 'sean'
merge from sean
solve the conflict file