update todo
merge conflict in todo.md