animation is working
merge