Merge conflict with the blog resolved.