修正dashboard的冲突bug