updated dashboard
resolved conflict