boss3 animations
merge conflicts