merge last edits