nettoyage
resolves conflicts