Resolve Conflict with dashController
Removed DS_Store to resolve conflict