Mere teknisk
Conflict resolved