fixed animator
merged conflicts