changes faqs
merge changes