Two players and a playable game
fixed merge problems