implement combo animation.
fix merger local to master.