Completed merge of game (but it doesn't work)