fixe propose faq and approve permission
fixe merge conflict