Tors endringer
merge conflict resolved