fix the bad merge
Merge pull request #45 from konglingkai/hotfix

fix the bad merge