Fix merge issues

solo-chains/runtime/dancelight/src/xcm_config.rs

@@ -44,10 +44,10 @@ use {
         AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
         ChildParachainConvertsVia, DescribeAllTerminal, DescribeFamily, FixedWeightBounds,
         FrameTransactionalProcessor, FungibleAdapter, HashedDescription, IsChildSystemParachain,
-        IsConcrete, MintLocation, OriginToPluralityVoice, ParentIsPreset, SendXcmFeeToAccount,
-        SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
-        SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
-        WithComputedOrigin, WithUniqueTopic, XcmFeeManagerFromComponents,
+        IsConcrete, MintLocation, OriginToPluralityVoice, SendXcmFeeToAccount,
+        SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation,
+        TakeWeightCredit, TrailingSetTopicAsId, UsingComponents, WithComputedOrigin,
+        WithUniqueTopic, XcmFeeManagerFromComponents,
     },
     xcm_executor::XcmExecutor,
 };
@@ -117,23 +117,6 @@ pub type XcmRouter = WithUniqueTopic<
     ChildParachainRouter<Runtime, XcmPallet, PriceForChildParachainDelivery>,
 >;
 
-/// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
-/// when determining ownership of accounts for asset transacting and when attempting to use XCM
-/// `Transact` in order to determine the dispatch Origin.
-pub type LocationToAccountId = (
-    // The parent (Relay-chain) origin converts to the default `AccountId`.
-    ParentIsPreset<AccountId>,
-    // Sibling parachain origins convert to AccountId via the `ParaId::into`.
-    SiblingParachainConvertsVia<polkadot_parachain_primitives::primitives::Sibling, AccountId>,
-    // If we receive a Location of type AccountKey20, just generate a native account
-    AccountId32Aliases<RelayNetwork, AccountId>,
-    // Generate remote accounts according to polkadot standards
-    xcm_builder::HashedDescription<
-        AccountId,
-        xcm_builder::DescribeFamily<xcm_builder::DescribeAllTerminal>,
-    >,
-);
-
 parameter_types! {
     pub Star: AssetFilter = Wild(AllOf { fun: WildFungible, id: AssetId(TokenLocation::get()) });
     pub AssetHub: Location = Parachain(ASSET_HUB_ID).into_location();