last merged version

see todo-file