BS-2570, revert modifification on merge algorithm