merge final version