animation controller added
merge