merge faq updates