before merge
fixed todo.txt