updated todo.txt
added merge script