From 8b4a62b4b3046c59e4f5620dc6badf94e106d31c Mon Sep 17 00:00:00 2001
From: theodorerose <theodorerose@google.com>
Date: Thu, 30 Jun 2022 22:35:12 +0000
Subject: [PATCH] merged from upstream

---
 src/google/protobuf/arena.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc
index 90136930c9..a773208fd2 100644
--- a/src/google/protobuf/arena.cc
+++ b/src/google/protobuf/arena.cc
@@ -153,12 +153,8 @@ void* SerialArena::AllocateAlignedWithCleanupFallback(
 PROTOBUF_NOINLINE
 void SerialArena::AddCleanupFallback(void* elem, void (*destructor)(void*),
                                      const AllocationPolicy* policy) {
-<<<<<<< HEAD
-  AllocateNewBlock(0, policy);
-=======
   size_t required = cleanup::Size(destructor);
   AllocateNewBlock(required, policy);
->>>>>>> 87d285c785cd1a4334e3e21e5d468a9bc3e85f62
   AddCleanupFromExisting(elem, destructor);
 }