fixing input bug that was causing player1 and player2 to be entangled at the beginning of the game
fixing merge conflicts