diff --git a/packages/taiko-client/driver/txlist_decompressor/txlist_decompressor.go b/packages/taiko-client/driver/txlist_decompressor/txlist_decompressor.go
index 93bf293d477..bc576addd3d 100644
--- a/packages/taiko-client/driver/txlist_decompressor/txlist_decompressor.go
+++ b/packages/taiko-client/driver/txlist_decompressor/txlist_decompressor.go
@@ -45,11 +45,7 @@ func (v *TxListDecompressor) TryDecompress(
 	txListBytes []byte,
 	blobUsed bool,
 ) []byte {
-<<<<<<< Updated upstream
-	if chainID.Cmp(params.HeklaNetworkID) == 0 {
-=======
 	if chainID.Cmp(params.HeklaNetworkID) != 0 {
->>>>>>> Stashed changes
 		return v.tryDecompressHekla(blockID, txListBytes, blobUsed)
 	}