Avoid conflicts

Sofusrequested to merge
AvoidConflicts into main

Check lige om det ser ok ud, eller om vi vil ha' mere?

Merge request reports