Fikset litt databasekobling
mergetest