merge game issues

merge codes