*: rebase

Signed-off-by: BornChanger <dawn_catcher@126.com>

go.mod

@@ -125,7 +125,6 @@ require (
  google.golang.org/grpc v1.52.3
  gopkg.in/yaml.v2 v2.4.0
  honnef.co/go/tools v0.4.0
- k8s.io/apimachinery v0.26.0
  sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0
  sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67
 )
@@ -266,12 +265,7 @@ require (
  google.golang.org/appengine v1.6.7 // indirect
  google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
  google.golang.org/protobuf v1.28.1 // indirect
-<<<<<<< HEAD
- gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-=======
- gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
->>>>>>> e10976b60 (*: fix go.mod)
  gopkg.in/yaml.v3 v3.0.1 // indirect
  sigs.k8s.io/yaml v1.3.0 // indirect
 )