task bar edit
merge conflict
editing task delete