Fixed conflicts

Author: PoulavBhowmick03

beacon_node/store/src/state_cache.rs

@@ -1,7 +1,7 @@
 use crate::hdiff::HDiffBuffer;
 use crate::{
-    memsize::{BeaconStateWrapper, BeaconStateMemorySize},
     Error,
+    memsize::{BeaconStateMemorySize, BeaconStateWrapper},
     metrics::{self, HOT_METRIC},
 };
 use lru::LruCache;

lighthouse/tests/beacon_node.rs

@@ -2,8 +2,7 @@ use crate::exec::{CommandLineTestExec, CompletedTest};
 use beacon_node::beacon_chain::chain_config::{
     DEFAULT_RE_ORG_CUTOFF_DENOMINATOR, DEFAULT_RE_ORG_HEAD_THRESHOLD,
     DEFAULT_RE_ORG_MAX_EPOCHS_SINCE_FINALIZATION, DEFAULT_STATE_CACHE_MAX_BYTES,
-    DEFAULT_SYNC_TOLERANCE_EPOCHS,
-    DisallowedReOrgOffsets,
+    DEFAULT_SYNC_TOLERANCE_EPOCHS, DisallowedReOrgOffsets,
 };
 use beacon_node::{
     ClientConfig as Config, beacon_chain::graffiti_calculator::GraffitiOrigin,