update animations
resolve conflicts
resolve conflicts