test
resolve the conflict
resolve the conflict
Merge pull request #5 from pinguo-zhangzhi/master

resolve the conflict