finally smooth animations
conflict resolve