add FAQ file
add FAQ file & fix merge conflict