merge edits