fix: merge errors

Author: cuteolaf

pallets/subtensor/src/macros/hooks.rs

@@ -158,7 +158,7 @@ mod hooks {
                 // Reset unactive subnets
                 .saturating_add(migrations::migrate_reset_unactive_sn::migrate_reset_unactive_sn::<T>())
                 // Remove old identity map entries(Identities, SubnetIdentities, SubnetIdentitiesV2)
-                .saturating_add(migrations::migrate_remove_old_identity_maps::migrate_remove_old_identity_maps::<T>());
+                .saturating_add(migrations::migrate_remove_old_identity_maps::migrate_remove_old_identity_maps::<T>())
                 // Remove unknown neuron axon, certificate prom
                 .saturating_add(migrations::migrate_remove_unknown_neuron_axon_cert_prom::migrate_remove_unknown_neuron_axon_cert_prom::<T>());
             weight

pallets/subtensor/src/tests/migration.rs

@@ -2751,6 +2751,9 @@ fn test_migrate_remove_old_identity_maps() {
         migration,
         100,
     );
+}
+
+#[test]
 fn test_migrate_remove_unknown_neuron_axon_cert_prom() {
     use crate::migrations::migrate_remove_unknown_neuron_axon_cert_prom::*;
     const MIGRATION_NAME: &[u8] = b"migrate_remove_neuron_axon_cert_prom";