add task modification
|marjorie|add task conflicts solved