diff --git a/Cargo.lock b/Cargo.lock
index a975fc795c..9465c68183 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -485,6 +485,26 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e"
 
+[[package]]
+name = "bytemuck"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.9",
+ "syn 1.0.60",
+]
+
 [[package]]
 name = "byteorder"
 version = "1.3.4"
@@ -5130,12 +5150,8 @@ dependencies = [
  "borsh-derive",
  "bs58 0.3.1",
  "bv",
-<<<<<<< HEAD
- "curve25519-dalek 2.1.0",
-=======
  "bytemuck",
- "curve25519-dalek 3.2.0",
->>>>>>> f96685982 (Derive Pod/Zeroable for Pubkey)
+ "curve25519-dalek 2.1.0",
  "hex",
  "itertools 0.9.0",
  "lazy_static",
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
index 7ca8d0d0d7..fea6bc5805 100644
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@@ -299,6 +299,26 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
+[[package]]
+name = "bytemuck"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.6",
+ "syn 1.0.67",
+]
+
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -3295,12 +3315,8 @@ dependencies = [
  "borsh-derive",
  "bs58 0.3.1",
  "bv",
-<<<<<<< HEAD
- "curve25519-dalek 2.1.0",
-=======
  "bytemuck",
- "curve25519-dalek 3.2.0",
->>>>>>> f96685982 (Derive Pod/Zeroable for Pubkey)
+ "curve25519-dalek 2.1.0",
  "hex",
  "itertools 0.9.0",
  "lazy_static",
diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
index 6c0abef1d9..b1335ce1fe 100644
--- a/sdk/program/Cargo.toml
+++ b/sdk/program/Cargo.toml
@@ -12,17 +12,10 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.3.1"
-<<<<<<< HEAD
 borsh = "0.9.0"
 borsh-derive = "0.9.0"
 bs58 = "0.3.1"
-=======
-blake3 = { version = "1.0.0", features = ["traits-preview"] }
-borsh = "0.9.1"
-borsh-derive = "0.9.1"
-bs58 = "0.4.0"
 bytemuck = { version = "1.7.2", features = ["derive"] }
->>>>>>> f96685982 (Derive Pod/Zeroable for Pubkey)
 bv = { version = "0.11.1", features = ["serde"] }
 hex = "0.4.2"
 itertools =  "0.9.0"