Merge conflict resolved.