Update on walking and jumping in the player
Merge error on Git Updates