modif conf
fixe merge