Fix merge conflict code + delete ongbr. functie