Latest opgave1
Fixed merge conflict