diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
index 498458a9c4..8d1a26a0c9 100644
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -16,13 +16,8 @@ chrono = { version = "0.4.11", features = ["serde"] }
 chrono-humanize = "0.2.1"
 crossbeam-channel = "0.5"
 fs_extra = "1.2.0"
-<<<<<<< HEAD
-futures = "0.3.18"
-itertools = "0.10.1"
-=======
 futures = "0.3.17"
-itertools = "0.10.3"
->>>>>>> 2a6dcb2ff (Futures 0.3.18 has been yanked, back off to .17)
+itertools = "0.10.1"
 lazy_static = "1.4.0"
 libc = "0.2.108"
 log = { version = "0.4.14" }