Redo merge better