redo on the merge