xiaoguizi87 apply to join
Update xiaoguizi87.md
remove the confilt
Merge pull request #53 from xiaoguizi87/master

auto merged.