build for animation
fix animation
fixed conflict from next