Fixed the combination tween/danceparty effects
Fixed merge conflicts