added faq section
fixed conflict