update the blog article : new-year
fixed conflict