diff --git a/tests/util.go b/tests/util.go
index 4f7672e41f..c9dc84c800 100644
--- a/tests/util.go
+++ b/tests/util.go
@@ -33,7 +33,6 @@ import (
 	"github.com/expanse-org/go-expanse/ethdb"
 	"github.com/expanse-org/go-expanse/log"
 	"github.com/expanse-org/go-expanse/params"
->>>>>>> refs/remotes/ethereum/master
 )
 
 var (