Merge article-preview, and fix conflict.