Merging conflicts solved.