fix merge conflict

Author: sam0x17

pallets/subtensor/tests/mock.rs

@@ -1,14 +1,13 @@
 #![allow(clippy::arithmetic_side_effects, clippy::unwrap_used)]
-use frame_support::derive_impl;
-use frame_support::dispatch::DispatchResultWithPostInfo;
-use frame_support::weights::constants::RocksDbWeight;
+
 // use frame_support::weights::constants::WEIGHT_PER_SECOND;
 use frame_support::weights::Weight;
 use frame_support::{
     assert_ok, derive_impl,
     dispatch::DispatchResultWithPostInfo,
     parameter_types,
     traits::{Everything, Hooks},
+    weights::constants::RocksDbWeight,
 };
 use frame_system as system;
 use frame_system::{limits, EnsureNever, EnsureRoot, RawOrigin};