merge game code

merge game code