Changed animation
Fixed merge