ignore todo.txt
fixed merge conflicts