two players have their own controls now
fixed merge errors