fix conflicts

Author: chenyukang

Cargo.lock

@@ -24,6 +24,7 @@ ckb-app-config = { path = "../util/app-config", version = "= 0.113.0-pre" }
 ckb-constant = { path = "../util/constant", version = "= 0.113.0-pre" }
 jsonrpc-core = "18.0"
 serde_json = "1.0"
+jsonrpc-utils = { version = "0.2.2", features = ["server", "macros", "axum"] }
 ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.113.0-pre" }
 ckb-verification = { path = "../verification", version = "= 0.113.0-pre" }
 ckb-verification-traits = { path = "../verification/traits", version = "= 0.113.0-pre" }
@@ -37,6 +38,7 @@ ckb-tx-pool = { path = "../tx-pool", version = "= 0.113.0-pre" }
 ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.113.0-pre" }
 ckb-pow = { path = "../pow", version = "= 0.113.0-pre" }
 ckb-indexer = { path = "../util/indexer", version = "= 0.113.0-pre" }
+ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.113.0-pre" }
 itertools.workspace = true
 tokio = "1"
 async-trait = "0.1"
@@ -45,7 +47,7 @@ tokio-util = { version = "0.7.3", features = ["codec"] }
 futures-util = { version = "0.3.21"}
 tower-http = { version = "0.3.5", features = ["timeout"] }
 async-stream = "0.3.3"
-ckb-async-runtime = { path = "../util/runtime", version = "= 0.112.0-pre" }
+ckb-async-runtime = { path = "../util/runtime", version = "= 0.113.0-pre" }
 
 [dev-dependencies]
 reqwest = { version = "=0.11.20", features = ["blocking", "json"] }