added comments with 3 categories for articles
fixed merge conflicts