renamed folder and the Animation
merge conflict