fixed animations
fixed merge conflict