add article
merge
fix merge