Rename first, second to original, merged
Add drag-n-drop of all stuff on mouse right click