GameMenu
Merge pull request #2 from bacph178/master

GameMenu
fix conflict menu