Merge final changes