mark a todo as done
extra info for conflicts