changes for generating article from database
resolved conflict