Redo merge