madde 3 purple
Fixed merge conflict