dashboard complete
done with dashboard
conflicts resolved