added timeout feature for game
fixed merge conflict