add record scale animation
merge conflict