finished dashboard
resolved conflicts