Monday mid-day status update
monday midday status udate
resolved conflicts