fix bad merge; better test for Games#show