update article and setting
conflicted and merge...