From 116e8b931f37f4d2b77b9cfb897883da2744198b Mon Sep 17 00:00:00 2001
From: hangleang <hangleang127@gmail.com>
Date: Sun, 22 Dec 2024 01:38:27 +0700
Subject: [PATCH] resolved conflict

---
 helper_functions/src/fork.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helper_functions/src/fork.rs b/helper_functions/src/fork.rs
index 7a6fa5d3..ccd8b509 100644
--- a/helper_functions/src/fork.rs
+++ b/helper_functions/src/fork.rs
@@ -549,7 +549,7 @@ pub fn upgrade_to_electra<P: Preset>(
     // initial value of `earliest_exit_epoch`
     let earliest_activation_epoch = misc::compute_activation_exit_epoch::<P>(epoch);
 
-    for exit_epoch in validators
+    let earliest_exit_epoch = validators
         .into_iter()
         .map(|validator| validator.exit_epoch)
         .filter(|exit_epoch| *exit_epoch != FAR_FUTURE_EPOCH)