Masse valideringsdrit
Fix mergeconflicts