add mix animation
merge master and fixed conflict