changes
conflict removed in dashboards index page