fix conflict
Merge pull request #10 from louis378/blacktea-master

fix conflict