fix spell error
add rotate animate
handle conflict
handle conflict