fixed the not being able to move where the other player is
after merge