Merge Diagram edits