to fetch
fix conflict
fixed compile error
Merge pull request #8 from HandsomeCharming/master

fix the fucking compile error