checkout conflict solve?
Merge branch 'master' of https://github.com/BoundlessWisdom/WorldGame.git