modified tasks
resolved conflicts
edits