From 6baba9ee91afb4b505ab9ec05a6cb38799ff72ee Mon Sep 17 00:00:00 2001
From: Greg Zaitsev <gregz@opentensor.dev>
Date: Fri, 5 Dec 2025 14:50:51 -0500
Subject: [PATCH] Fix merge conflicts

---
 pallets/swap/src/pallet/mod.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pallets/swap/src/pallet/mod.rs b/pallets/swap/src/pallet/mod.rs
index 06a122ab4f..97a25ec242 100644
--- a/pallets/swap/src/pallet/mod.rs
+++ b/pallets/swap/src/pallet/mod.rs
@@ -609,7 +609,7 @@ mod pallet {
         pub fn disable_lp(origin: OriginFor<T>) -> DispatchResult {
             ensure_root(origin)?;
 
-            for netuid in 1..128 {
+            for netuid in 1..=128 {
                 let netuid = NetUid::from(netuid as u16);
                 if EnabledUserLiquidity::<T>::get(netuid) {
                     EnabledUserLiquidity::<T>::insert(netuid, false);
@@ -617,10 +617,11 @@ mod pallet {
                         netuid,
                         enable: false,
                     });
-
-                    // Remove provided liquidity
-                    // Self::do_dissolve_all_liquidity_providers(netuid)?;
                 }
+
+                // Remove provided liquidity unconditionally because the network may have
+                // user liquidity previously disabled
+                Self::do_dissolve_all_liquidity_providers(netuid)?;
             }
 
             Ok(())