modified game menu
fixed merge issues