Merge final proposal edits