small merge fixe