begynt pa close, sjekke itte mergeconflict me jensemann atm