Cleaning conflict traces from a few files.
Merge branch 'dashboard'