diff --git a/.ckb-light-version b/.ckb-light-version
index d3237ae7d..5aff472dd 100644
--- a/.ckb-light-version
+++ b/.ckb-light-version
@@ -1,5 +1 @@
-<<<<<<< HEAD
 v0.4.1
-=======
-v0.4.0
->>>>>>> 9a82bc451 (feat: update ckb client versions)
diff --git a/.ckb-version b/.ckb-version
index 96c8cb193..11c3166fe 100644
--- a/.ckb-version
+++ b/.ckb-version
@@ -1,5 +1 @@
-<<<<<<< HEAD
 v0.120.0
-=======
-v0.119.0
->>>>>>> 9a82bc451 (feat: update ckb client versions)
diff --git a/packages/neuron-ui/src/utils/scriptAndAddress.ts b/packages/neuron-ui/src/utils/scriptAndAddress.ts
index 4a6d9034b..dfc0965bc 100644
--- a/packages/neuron-ui/src/utils/scriptAndAddress.ts
+++ b/packages/neuron-ui/src/utils/scriptAndAddress.ts
@@ -13,9 +13,6 @@ export const scriptToAddress = (
   { isMainnet = true, deprecated = false }: { isMainnet?: boolean; deprecated?: boolean }
 ) => {
   const config = { config: isMainnet ? MAINNET : TESTNET }
-  if (['data1', 'data2'].includes(script.hashType)) {
-    return encodeToAddress(script, config)
-  }
   return deprecated ? generateAddress(script, config) : encodeToAddress(script, config)
 }