add sth about YAML in FAQ
fix conflict