finished initial game
resolve merge