add comments about module and conf
merge conflict