change show article
resolve conflicts
resolve conflicts
Merge branch 'master' of https://github.com/Namlluks/VIP