add dashboard
fix confilicts
dashing