Merge fixed, added faqs