fixing merge conflicts with Dashboard 2.0