answer a faq and view a faq
fixe merge conflict