Fixa lag.
Fixa lag merge conflict.