diff --git a/Cargo.lock b/Cargo.lock
index 13dc952dd7..a8c52e73bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5843,8 +5843,7 @@ dependencies = [
 [[package]]
 name = "merlin"
 version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
+source = "git+https://github.com/aptos-labs/merlin#3454ccc85e37355c729ba40e6dac6e867ddf59f5"
 dependencies = [
  "byteorder",
  "keccak",
diff --git a/Cargo.toml b/Cargo.toml
index 077270c245..edefa9bc08 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -627,4 +627,5 @@ debug = false
 #opt-level = 2
 
 [patch.crates-io]
-x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
\ No newline at end of file
+x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
+merlin = { git = "https://github.com/aptos-labs/merlin" }
diff --git a/vm/vm-runtime-types/src/resolver.rs b/vm/vm-runtime-types/src/resolver.rs
index 0478d6ba27..49daa9560d 100644
--- a/vm/vm-runtime-types/src/resolver.rs
+++ b/vm/vm-runtime-types/src/resolver.rs
@@ -12,8 +12,8 @@ use starcoin_vm_types::{
         state_key::StateKey,
         state_storage_usage::StateStorageUsage,
         state_value::{StateValue, StateValueMetadata},
+        StateView, StateViewId,
     },
-    state_view::{StateView, StateViewId},
 };
 use std::collections::{BTreeMap, HashMap};
 
@@ -235,7 +235,7 @@ where
         state_key: &Self::Key,
         _maybe_layout: Option<&Self::Layout>,
     ) -> anyhow::Result<Option<StateValue>> {
-        self.get_state_value(state_key)
+        self.get_state_value(state_key).map_err(Into::into)
     }
 }
 
@@ -246,7 +246,7 @@ where
     type Key = StateKey;
 
     fn get_module_state_value(&self, state_key: &Self::Key) -> anyhow::Result<Option<StateValue>> {
-        self.get_state_value(state_key)
+        self.get_state_value(state_key).map_err(Into::into)
     }
 }
 
diff --git a/vm/vm-runtime-types/src/storage/mod.rs b/vm/vm-runtime-types/src/storage/mod.rs
index d7bf149827..4fd1f6d9f2 100644
--- a/vm/vm-runtime-types/src/storage/mod.rs
+++ b/vm/vm-runtime-types/src/storage/mod.rs
@@ -18,7 +18,7 @@ impl StorageGasParameters {
     pub fn new(
         feature_version: u64,
         gas_params: &StarcoinGasParameters,
-        config_storage: &impl ConfigStorage,
+        _config_storage: &impl ConfigStorage,
     ) -> Self {
         let change_set_configs = ChangeSetConfigs::new(feature_version, gas_params);