refine animation
merge conflict