Merge corrigé