From ac68ce62c2d27aa0edc8fabc07bd1045a7c1a3cc Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Wed, 27 Jul 2022 10:16:04 +0200
Subject: [PATCH] Merge conflicts

---
 evm/src/memory/segments.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evm/src/memory/segments.rs b/evm/src/memory/segments.rs
index 00b4c8de..15545ea0 100644
--- a/evm/src/memory/segments.rs
+++ b/evm/src/memory/segments.rs
@@ -69,6 +69,7 @@ impl Segment {
             Segment::Returndata => 8,
             Segment::Metadata => 256,
             Segment::KernelGeneral => 256,
+            Segment::TxnFields => 256,
             Segment::TxnData => 256,
             Segment::RlpRaw => 8,
         }