correction du merge + MàJ Sf2.4 (composer + maintenance)