Fix merging, move 'play for me' to demo button, add suggestions when game is over