Quelques modifications ...
Modifications + merged