solving conflicts

go.mod

@@ -20,13 +20,8 @@ require (
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-<<<<<<< HEAD
-	github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25 // indirect
-	github.com/kr/pretty v0.2.1 // indirect
-=======
 	github.com/google/pprof v0.0.0-20240903155634-a8630aee4ab9 // indirect
 	github.com/kr/text v0.2.0 // indirect
->>>>>>> origin/v4
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-sqlite3 v1.14.23 // indirect
@@ -35,31 +30,19 @@ require (
 	github.com/tklauser/go-sysconf v0.3.14 // indirect
 	github.com/tklauser/numcpus v0.8.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-<<<<<<< HEAD
-	golang.org/x/image v0.18.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
-=======
 	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
 	golang.org/x/image v0.20.0 // indirect
 	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
 	golang.org/x/tools v0.25.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
->>>>>>> origin/v4
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 // replace github.com/syifan/goseth => ../goseth
 
-<<<<<<< HEAD
-replace github.com/sarchlab/akita/v3 => ../akita
-=======
 // replace github.com/sarchlab/akita/v4 => ../akita
->>>>>>> origin/v4
 
 go 1.22.0