diff --git a/Cargo.toml b/Cargo.toml
index f47630cf66..c5141663e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -235,7 +235,11 @@ jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = [
     "unprefixed_malloc_on_supported_platforms",
 ] }
 js-sys = "0.3.67"
+<<<<<<< HEAD
 jito-protos = { path = "jito-protos", version = "=1.18.26" }
+=======
+jito-protos = { path = "jito-protos", version = "=1.18.23" }
+>>>>>>> 83b1be7567 (jito patch)
 jito-tip-distribution = { path = "jito-programs/mev-programs/programs/tip-distribution", features = ["no-entrypoint"] }
 jito-tip-payment = { path = "jito-programs/mev-programs/programs/tip-payment", features = ["no-entrypoint"] }
 json5 = "0.4.1"
@@ -319,6 +323,7 @@ smallvec = "1.13.2"
 smpl_jwt = "0.7.1"
 socket2 = "0.5.5"
 soketto = "0.7"
+<<<<<<< HEAD
 solana-account-decoder = { path = "account-decoder", version = "=1.18.26" }
 solana-accounts-db = { path = "accounts-db", version = "=1.18.26" }
 solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=1.18.26" }
@@ -401,6 +406,90 @@ solana-wen-restart = { path = "wen-restart", version = "=1.18.26" }
 solana-zk-keygen = { path = "zk-keygen", version = "=1.18.26" }
 solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=1.18.26" }
 solana-zk-token-sdk = { path = "zk-token-sdk", version = "=1.18.26" }
+=======
+solana-account-decoder = { path = "account-decoder", version = "=1.18.23" }
+solana-accounts-db = { path = "accounts-db", version = "=1.18.23" }
+solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=1.18.23" }
+solana-banks-client = { path = "banks-client", version = "=1.18.23" }
+solana-banks-interface = { path = "banks-interface", version = "=1.18.23" }
+solana-banks-server = { path = "banks-server", version = "=1.18.23" }
+solana-bench-tps = { path = "bench-tps", version = "=1.18.23" }
+solana-bloom = { path = "bloom", version = "=1.18.23" }
+solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=1.18.23" }
+solana-bucket-map = { path = "bucket_map", version = "=1.18.23" }
+solana-bundle = { path = "bundle", version = "=1.18.23" }
+solana-cargo-registry = { path = "cargo-registry", version = "=1.18.23" }
+solana-clap-utils = { path = "clap-utils", version = "=1.18.23" }
+solana-clap-v3-utils = { path = "clap-v3-utils", version = "=1.18.23" }
+solana-cli = { path = "cli", version = "=1.18.23" }
+solana-cli-config = { path = "cli-config", version = "=1.18.23" }
+solana-cli-output = { path = "cli-output", version = "=1.18.23" }
+solana-client = { path = "client", version = "=1.18.23" }
+solana-compute-budget-program = { path = "programs/compute-budget", version = "=1.18.23" }
+solana-config-program = { path = "programs/config", version = "=1.18.23" }
+solana-connection-cache = { path = "connection-cache", version = "=1.18.23", default-features = false }
+solana-core = { path = "core", version = "=1.18.23" }
+solana-cost-model = { path = "cost-model", version = "=1.18.23" }
+solana-download-utils = { path = "download-utils", version = "=1.18.23" }
+solana-entry = { path = "entry", version = "=1.18.23" }
+solana-faucet = { path = "faucet", version = "=1.18.23" }
+solana-frozen-abi = { path = "frozen-abi", version = "=1.18.23" }
+solana-frozen-abi-macro = { path = "frozen-abi/macro", version = "=1.18.23" }
+solana-genesis = { path = "genesis", version = "=1.18.23" }
+solana-genesis-utils = { path = "genesis-utils", version = "=1.18.23" }
+solana-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=1.18.23" }
+solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=1.18.23" }
+solana-gossip = { path = "gossip", version = "=1.18.23" }
+solana-ledger = { path = "ledger", version = "=1.18.23" }
+solana-loader-v4-program = { path = "programs/loader-v4", version = "=1.18.23" }
+solana-local-cluster = { path = "local-cluster", version = "=1.18.23" }
+solana-logger = { path = "logger", version = "=1.18.23" }
+solana-measure = { path = "measure", version = "=1.18.23" }
+solana-merkle-tree = { path = "merkle-tree", version = "=1.18.23" }
+solana-metrics = { path = "metrics", version = "=1.18.23" }
+solana-net-utils = { path = "net-utils", version = "=1.18.23" }
+solana-nohash-hasher = "0.2.1"
+solana-notifier = { path = "notifier", version = "=1.18.23" }
+solana-perf = { path = "perf", version = "=1.18.23" }
+solana-poh = { path = "poh", version = "=1.18.23" }
+solana-program = { path = "sdk/program", version = "=1.18.23" }
+solana-program-runtime = { path = "program-runtime", version = "=1.18.23" }
+solana-program-test = { path = "program-test", version = "=1.18.23" }
+solana-pubsub-client = { path = "pubsub-client", version = "=1.18.23" }
+solana-quic-client = { path = "quic-client", version = "=1.18.23" }
+solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=1.18.23" }
+solana-remote-wallet = { path = "remote-wallet", version = "=1.18.23", default-features = false }
+solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=1.18.23" }
+solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=1.18.23" }
+solana-rpc = { path = "rpc", version = "=1.18.23" }
+solana-rpc-client = { path = "rpc-client", version = "=1.18.23", default-features = false }
+solana-rpc-client-api = { path = "rpc-client-api", version = "=1.18.23" }
+solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=1.18.23" }
+solana-runtime = { path = "runtime", version = "=1.18.23" }
+solana-runtime-plugin = { path = "runtime-plugin", version = "=1.18.23" }
+solana-runtime-transaction = { path = "runtime-transaction", version = "=1.18.23" }
+solana-sdk = { path = "sdk", version = "=1.18.23" }
+solana-sdk-macro = { path = "sdk/macro", version = "=1.18.23" }
+solana-send-transaction-service = { path = "send-transaction-service", version = "=1.18.23" }
+solana-stake-program = { path = "programs/stake", version = "=1.18.23" }
+solana-storage-bigtable = { path = "storage-bigtable", version = "=1.18.23" }
+solana-storage-proto = { path = "storage-proto", version = "=1.18.23" }
+solana-streamer = { path = "streamer", version = "=1.18.23" }
+solana-system-program = { path = "programs/system", version = "=1.18.23" }
+solana-test-validator = { path = "test-validator", version = "=1.18.23" }
+solana-thin-client = { path = "thin-client", version = "=1.18.23" }
+solana-tpu-client = { path = "tpu-client", version = "=1.18.23", default-features = false }
+solana-transaction-status = { path = "transaction-status", version = "=1.18.23" }
+solana-turbine = { path = "turbine", version = "=1.18.23" }
+solana-udp-client = { path = "udp-client", version = "=1.18.23" }
+solana-version = { path = "version", version = "=1.18.23" }
+solana-vote = { path = "vote", version = "=1.18.23" }
+solana-vote-program = { path = "programs/vote", version = "=1.18.23" }
+solana-wen-restart = { path = "wen-restart", version = "=1.18.23" }
+solana-zk-keygen = { path = "zk-keygen", version = "=1.18.23" }
+solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=1.18.23" }
+solana-zk-token-sdk = { path = "zk-token-sdk", version = "=1.18.23" }
+>>>>>>> 83b1be7567 (jito patch)
 solana_rbpf = "=0.8.3"
 spl-associated-token-account = "=2.3.0"
 spl-instruction-padding = "0.1"