AUI-1104 Adding merge functionality to UndoRedo