feature/858_set_titel
resolve merge conflict