Added new player animation, fixed merge conflict in Collision