resolve conflicts
First Walk Animation