checkpoint anim
fix conflicts