Merge conflict solved.