merging edits