From 88f4e32c8d35c91549ade70843094a77348d75bb Mon Sep 17 00:00:00 2001
From: Masha Basmanova <mbasmanova@fb.com>
Date: Wed, 6 Dec 2023 12:03:48 -0500
Subject: [PATCH] Fix merge conflict

---
 velox/common/memory/tests/HashStringAllocatorTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/velox/common/memory/tests/HashStringAllocatorTest.cpp b/velox/common/memory/tests/HashStringAllocatorTest.cpp
index 3838747b0d24..0337b62e8c00 100644
--- a/velox/common/memory/tests/HashStringAllocatorTest.cpp
+++ b/velox/common/memory/tests/HashStringAllocatorTest.cpp
@@ -292,7 +292,7 @@ TEST_F(HashStringAllocatorTest, mixedMultipart) {
   const std::string shortString(25, 'x');
   const std::string extraLongString(5'000, 'y');
 
-  ByteStream stream(allocator_.get());
+  ByteOutputStream stream(allocator_.get());
 
   auto start = allocator_->newWrite(stream);
   stream.appendStringView(shortString);