diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index b50aa0ee13..20a1170eca 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1412,22 +1412,6 @@ fn assert_instruction_count() {
     {
         programs.extend_from_slice(&[
             ("solana_bpf_rust_128bit", 584),
-<<<<<<< HEAD
-            ("solana_bpf_rust_alloc", 7388),
-            ("solana_bpf_rust_custom_heap", 536),
-            ("solana_bpf_rust_dep_crate", 47),
-            ("solana_bpf_rust_external_spend", 507),
-            ("solana_bpf_rust_iter", 824),
-            ("solana_bpf_rust_many_args", 1289),
-            ("solana_bpf_rust_mem", 5997),
-            ("solana_bpf_rust_membuiltins", 3976),
-            ("solana_bpf_rust_noop", 481),
-            ("solana_bpf_rust_param_passing", 146),
-            ("solana_bpf_rust_rand", 488),
-            ("solana_bpf_rust_sanity", 9128),
-            ("solana_bpf_rust_secp256k1_recover", 25889),
-            ("solana_bpf_rust_sha", 30692),
-=======
             ("solana_bpf_rust_alloc", 4459),
             ("solana_bpf_rust_custom_heap", 469),
             ("solana_bpf_rust_dep_crate", 2),
@@ -1439,10 +1423,9 @@ fn assert_instruction_count() {
             ("solana_bpf_rust_noop", 326),
             ("solana_bpf_rust_param_passing", 146),
             ("solana_bpf_rust_rand", 429),
-            ("solana_bpf_rust_sanity", 9139),
+            ("solana_bpf_rust_sanity", 52290),
             ("solana_bpf_rust_secp256k1_recover", 25707),
-            ("solana_bpf_rust_sha", 26390),
->>>>>>> 03ed334eb (Double the chunk size for sending the program binary data in tx)
+            ("solana_bpf_rust_sha", 26384),
         ]);
     }
 
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 46b0c3ceb5..f442820d6c 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -102,7 +102,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
 fi
 
 # Install Rust-BPF
-version=v1.23
+version=v1.24
 if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
   (
     set -e
diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
index 74eba41736..42bdf2086b 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -477,7 +477,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
 
     // The following line is scanned by CI configuration script to
     // separate cargo caches according to the version of sbf-tools.
-    let bpf_tools_version = "v1.23";
+    let bpf_tools_version = "v1.24";
     let package = "bpf-tools";
     let target_path = home_dir
         .join(".cache")