fix bug preventing switch tabs
fix bug preventing switch tabs
no merge animation
merge