wip
merge + builder idle animaiton