merge problemet fikset, men include mangler i view (sorry)