application dashboard: merge conflict