resolving merge conflict with faq