diff --git a/pallets/subtensor/tests/coinbase.rs b/pallets/subtensor/tests/coinbase.rs
index ef2b3064f..263d7f2b0 100644
--- a/pallets/subtensor/tests/coinbase.rs
+++ b/pallets/subtensor/tests/coinbase.rs
@@ -9,7 +9,7 @@ use sp_core::U256;
 fn test_hotkey_hashing() {
     new_test_ext(1).execute_with(|| {
         for i in 0..10000 {
-            SubtensorModule::hash_hotkey_to_u64(&U256::from(i)).is_some();
+            assert!(SubtensorModule::hash_hotkey_to_u64(&U256::from(i)).is_some());
         }
     });
 }
diff --git a/pallets/subtensor/tests/mock.rs b/pallets/subtensor/tests/mock.rs
index 5f7fdca22..73c7f7d04 100644
--- a/pallets/subtensor/tests/mock.rs
+++ b/pallets/subtensor/tests/mock.rs
@@ -160,15 +160,12 @@ parameter_types! {
     pub const InitialSubnetLimit: u16 = 10; // Max 10 subnets.
     pub const InitialNetworkRateLimit: u64 = 0;
     pub const InitialTargetStakesPerInterval: u16 = 2;
-<<<<<<< HEAD
     pub const InitialHotkeyEmissionTempo: u64 = 0; // Defaults to draining every block.
     pub const InitialNetworkMaxStake: u64 = 500_000_000_000_000; // 500,000 TAO
-=======
     pub const InitialHotkeySwapCost: u64 = 1_000_000_000;
     pub const InitialAlphaHigh: u16 = 58982; // Represents 0.9 as per the production default
     pub const InitialAlphaLow: u16 = 45875; // Represents 0.7 as per the production default
     pub const InitialLiquidAlphaOn: bool = false; // Default value for LiquidAlphaOn
->>>>>>> main
 }
 
 // Configure collective pallet for council