Removed merge stuff
Changed 'faq' to 'faqs'