From f7197b79fc17b29b0ae8d9d910f26b513a655f57 Mon Sep 17 00:00:00 2001
From: Abel Armoa <30988000+aarmoa@users.noreply.github.com>
Date: Tue, 14 Apr 2026 14:24:47 -0300
Subject: [PATCH] [CHORE] Solved merge issues between master and dev branches

---
 Makefile | 4 ++--
 go.mod   | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6f46d4ff..4fb32c7b 100644
--- a/Makefile
+++ b/Makefile
@@ -202,9 +202,9 @@ extract-message-names:
 #	done
 
 tests:
-	go test -race ./client/... ./ethereum/...
+	go clean -testcache && go test -race ./client/... ./ethereum/...
 coverage:
-	go test -race -coverprofile=coverage.out -covermode=atomic ./client/... ./ethereum/...
+	go clean -testcache && go test -race -coverprofile=coverage.out -covermode=atomic ./client/... ./ethereum/...
 
 lint: export GOPROXY=direct
 lint:
diff --git a/go.mod b/go.mod
index 0a0e9c5a..1ffabf5e 100644
--- a/go.mod
+++ b/go.mod
@@ -253,8 +253,6 @@ replace (
 	github.com/cosmos/ibc-go/modules/capability => github.com/InjectiveLabs/ibc-go/modules/capability v1.0.0-inj.4
 	github.com/cosmos/ibc-go/modules/light-clients/08-wasm => github.com/InjectiveLabs/ibc-go/modules/light-clients/08-wasm v0.5.0-inj.4
 	github.com/cosmos/ibc-go/v8 => github.com/InjectiveLabs/ibc-go/v8 v8.7.0-inj.4
-
-	// geth dev
 	github.com/ethereum/go-ethereum => github.com/InjectiveLabs/go-ethereum v1.16.3-inj.2
 
 	github.com/improbable-eng/grpc-web => github.com/maxim-inj/grpc-web v0.15.0-inj