tile animation
resolved conflicts
change speed