fixed merge conflict.
Merge pull request #24 from leancloud/wujun_wp

fixed merge conflict.