diff --git a/Cargo.lock b/Cargo.lock
index c45cdc0d0108..a0feb0477f8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8131,16 +8131,7 @@ dependencies = [
 [[package]]
 name = "zksync_concurrency"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50302b77192891256d180ff2551dc0c3bc4144958b49e9a16c50a0dc218958ba"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
  "once_cell",
@@ -8174,16 +8165,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_bft"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2325c7486a8280db1c26c10020350bead6eecb3de03f8bbfd878060f000cdce7"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -8204,16 +8186,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_crypto"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5cb8ed0d59593f6147085b77142628e459ba673aa4d48fce064d5b96e31eb36"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
  "blst",
@@ -8236,18 +8209,10 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_executor"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "247b70ec255781b3b740acb744236e771a192922ffbaa52c462b84c4ea67609f"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
+ "async-trait",
  "rand 0.8.5",
  "tracing",
  "vise",
@@ -8264,16 +8229,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_network"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f10626b79885a9b096cd19ee83d85ef9b0554f061a9db6946f2b7c9d1b2f49ea"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -8307,16 +8263,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_roles"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ffe3e47d99eb943eb94f2f5c9d929b1192bf3e8d1434de0fa6f0090f9c1197e"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
  "bit-vec",
@@ -8337,16 +8284,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_storage"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ae9a0ec64ce9c0af346e50cc87dc257c30259101ce9675b408cb883e096087"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -8365,16 +8303,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_utils"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24dc6135abeefa80f617eb2903fe43d137d362bf673f0651b4894b17069d1fb1"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
  "rand 0.8.5",
@@ -9313,16 +9242,7 @@ dependencies = [
 [[package]]
 name = "zksync_protobuf"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e7c7820f290db565a1b4ff73aa1175cd7d31498fca8d859eb5aceebd33468c"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
  "bit-vec",
@@ -9342,16 +9262,7 @@ dependencies = [
 [[package]]
 name = "zksync_protobuf_build"
 version = "0.1.0-rc.4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6cafeec1150ae91f1a37c8f0dce6b71b92b93e0c4153d32b4c37e2fd71bce2f"
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=638b23e291a35fe9109c68d42f277903aaae0c42#638b23e291a35fe9109c68d42f277903aaae0c42"
->>>>>>> 1ada9d3b3 (Update the era-consensus ref)
-=======
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=f0b265c1327aaad392d5a795b65b46a207162e1b#f0b265c1327aaad392d5a795b65b46a207162e1b"
->>>>>>> 43390c398 (Update the era-consensus dependency to runner fix)
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=aa29e87de0f87a55d2917d4e1e4de99d04364934#aa29e87de0f87a55d2917d4e1e4de99d04364934"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
diff --git a/Cargo.toml b/Cargo.toml
index e1d61a190130..171cb8094fbd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -292,13 +292,13 @@ zksync_base_token_adjuster = { version = "0.1.0", path = "core/node/base_token_a
 
 # TODO: Release era-consensus 0.1.0-rc.5
 [patch.crates-io]
-zksync_concurrency = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
-zksync_consensus_bft = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
-zksync_consensus_crypto = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
-zksync_consensus_executor = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
-zksync_consensus_network = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
-zksync_consensus_roles = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
-zksync_consensus_storage = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
-zksync_consensus_utils = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
-zksync_protobuf = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
-zksync_protobuf_build = { git = "https://github.com/matter-labs/era-consensus.git", rev = "f0b265c1327aaad392d5a795b65b46a207162e1b" }
+zksync_concurrency = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }
+zksync_consensus_bft = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }
+zksync_consensus_crypto = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }
+zksync_consensus_executor = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }
+zksync_consensus_network = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }
+zksync_consensus_roles = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }
+zksync_consensus_storage = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }
+zksync_consensus_utils = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }
+zksync_protobuf = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }
+zksync_protobuf_build = { git = "https://github.com/matter-labs/era-consensus.git", rev = "aa29e87de0f87a55d2917d4e1e4de99d04364934" }