merge final fix