merge old faq into new one