Added dash-board file
conflicts resolved