tricking out dashboards
fixing merge conflicts