some new animations
conflict resolved and new animations