Merge conflicts solved.