Direction choice for player exists now
Resolving merge conflicts