fixe merge