animations are perty
merge resolution