Og endring her.
Resolved conflict