Merge conflicts solved