merge conflict
article fix