changes to todo.md
Fixed todo merge conflict