Player lift animation
Merged and fixed conflicts