fix conflict
Merge pull request #28 from zhengzhiren/master

fix conflict