todolist merge
fini merge