Merge conflicts resolved.