new article
fix merge