Modified FAQ
conflict fixed