fix conflict between features CT Article, brand, page
Merge branch 'develop'