fix game flow with matches ending / going back to the saloon