resolve conflicts

Author: efd6

go.mod

@@ -235,21 +235,11 @@ require (
 	github.com/cilium/ebpf v0.21.0
 	github.com/coder/websocket v1.8.14
 	github.com/elastic/gokrb5/v8 v8.0.0-20251105095404-23cc45e6a102
-<<<<<<< HEAD
+	github.com/elastic/lumberjack v0.0.0-20260715013204-c5b60bbeaaab
 	github.com/gorilla/mux v1.8.1
 	github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901
 	github.com/mitchellh/gox v1.0.1
 	github.com/otiai10/copy v1.14.1
-=======
-	github.com/elastic/lumberjack v0.0.0-20260715013204-c5b60bbeaaab
-	github.com/jimlambrt/gldap v0.1.14
-	github.com/mattn/go-sqlite3 v1.14.32
-	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.155.0
-	github.com/parsiya/golnk v0.0.0-20251207220015-443df11fe4fb
-	github.com/richardlehane/mscfb v1.0.6
-	github.com/rogpeppe/go-internal v1.14.1
-	github.com/twmb/franz-go v1.21.3
->>>>>>> 3de266859 (mod: replace gopkg.in/natefinch/lumberjack.v2 with elastic fork (#51950))
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78
 	go.opentelemetry.io/collector/client v1.60.0
 	go.opentelemetry.io/collector/component/componenttest v0.154.0

go.sum

@@ -410,15 +410,10 @@ github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6 h1:VgOx6omXIMK
 github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6/go.mod h1:riddUzxTSBpJXk3qBHtYr4qOhFhT6k/1c0E3qkQjQpA=
 github.com/elastic/gosigar v0.14.4 h1:7NRnWJDFjEKpOjnHhtzrPGZWr9EMrYFsLjF4q0Czosk=
 github.com/elastic/gosigar v0.14.4/go.mod h1:tx91Eb3YgFk6y++h88fRAnxic3Si1ZDHooqnJU/hqo8=
-<<<<<<< HEAD
-github.com/elastic/mito v1.23.2 h1:cEtTsCdIoqglm1847b9NKu4HGImRcL4VA0exakfWCMw=
-github.com/elastic/mito v1.23.2/go.mod h1:nmkKaLmNGWf79vthVZcNBvKZCAFCaxx4I1LcJ1+OAfU=
-=======
 github.com/elastic/lumberjack v0.0.0-20260715013204-c5b60bbeaaab h1:p33sNyLrsWoIoRFL3E6hKajacBbsHuST8xW7y7cxGzY=
 github.com/elastic/lumberjack v0.0.0-20260715013204-c5b60bbeaaab/go.mod h1:t8v3y03G3KubyWgYqe+Jcxj/jDddnkp70743iSYrQiU=
-github.com/elastic/mito v1.27.0 h1:FM01Ql1OMx6uL3ogW0LoI8Ruc0O6gzmwLNBV8Zk13Yw=
-github.com/elastic/mito v1.27.0/go.mod h1:zFVE48AlN/iW7fryFDDPBh3yp1A4KWnkNuwxZt6HQ6A=
->>>>>>> 3de266859 (mod: replace gopkg.in/natefinch/lumberjack.v2 with elastic fork (#51950))
+github.com/elastic/mito v1.23.2 h1:cEtTsCdIoqglm1847b9NKu4HGImRcL4VA0exakfWCMw=
+github.com/elastic/mito v1.23.2/go.mod h1:nmkKaLmNGWf79vthVZcNBvKZCAFCaxx4I1LcJ1+OAfU=
 github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6 h1:JVNuBrmOoqLJgp9o68YBMnOrXCzQI3mCppW+suwRSlw=
 github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6/go.mod h1:cXqWcLnmu5y4QveTb2hjk7rgzkHMuZsqeXtbJpNAcu0=
 github.com/elastic/sarama v1.19.1-0.20260310070522-abae92ca1603 h1:QFDM5JuLch52FxjHizLP2tiuzfhulUdyOsUe/JuPhrQ=