diff --git a/build.gradle.kts b/build.gradle.kts
index a0544b438..c925cb25a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -51,7 +51,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.7.43"
+version = "1.7.44"
 
 repositories {
     google()
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/router/squid/SquidProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/router/squid/SquidProcessor.kt
index f1d7c1e40..c0362a6be 100644
--- a/src/commonMain/kotlin/exchange.dydx.abacus/processor/router/squid/SquidProcessor.kt
+++ b/src/commonMain/kotlin/exchange.dydx.abacus/processor/router/squid/SquidProcessor.kt
@@ -173,6 +173,8 @@ internal class SquidProcessor(
     override fun updateTokensDefaults(modified: MutableMap<String, Any>, selectedChainId: String?) {
         val tokenOptions = tokenOptions(selectedChainId)
         internalState.tokens = tokenOptions
+        modified.safeSet("transfer.depositOptions.assets", tokenOptions)
+        modified.safeSet("transfer.withdrawalOptions.assets", tokenOptions)
         modified.safeSet("transfer.token", defaultTokenAddress(selectedChainId))
         internalState.tokenResources = tokenResources(selectedChainId)
     }
diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipProcessorTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipProcessorTests.kt
index bab34cea4..7409f7f73 100644
--- a/src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipProcessorTests.kt
+++ b/src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipProcessorTests.kt
@@ -18,13 +18,9 @@ internal fun templateToJson(template: String): Map<String, Any> {
 
 class SkipProcessorTests {
 
-<<<<<<< HEAD
-    internal val skipProcessor = SkipProcessor(parser = Parser(), internalState = InternalTransferInputState())
-=======
     internal val internalState = InternalTransferInputState()
     internal val parser = Parser()
     internal val skipProcessor = SkipProcessor(parser = parser, internalState = internalState)
->>>>>>> d1c085f (fix tests and finish refactor)
     internal val skipChainsMock = SkipChainsMock()
     internal val skipTokensMock = SkipTokensMock()
     internal val selectedChainId = "osmosis-1"
@@ -308,4 +304,5 @@ class SkipProcessorTests {
         assertEquals(expectedTokens, internalState.tokens)
         assertEquals(expectedTokenResources, internalState.tokenResources)
     }
+    }
 }
diff --git a/v4_abacus.podspec b/v4_abacus.podspec
index 9cc9897c9..c63d69bbf 100644
--- a/v4_abacus.podspec
+++ b/v4_abacus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
-    spec.version                  = '1.7.42'
+    spec.version                  = '1.7.44'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''