Fikset merge conflict, la inn klassediagram.