unfinished work
resolved confict on managerDashboard