Ajoute controle ramassage
Fixe conflicts