changed allesKapput
added bla to allesKaputt
tried solving merge-conflict