merge the angular version of the game