Tentative de merge final