fixed 3d animate
handle conflict
fix conflict

fix conflict