Edit merge