diff --git a/go.mod b/go.mod
index 971974511..45efd7fcc 100644
--- a/go.mod
+++ b/go.mod
@@ -7,13 +7,8 @@ require (
 	github.com/dgraph-io/ristretto v0.2.0
 	github.com/docker/go-units v0.5.0
 	github.com/elastic/elastic-agent-client/v7 v7.18.0
-<<<<<<< HEAD
-	github.com/elastic/elastic-agent-libs v0.33.0
-	github.com/elastic/elastic-agent-system-metrics v0.14.0
-=======
 	github.com/elastic/elastic-agent-libs v0.33.1
 	github.com/elastic/elastic-agent-system-metrics v0.14.2
->>>>>>> 7882e49 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.33.0 to 0.33.1 (#6441))
 	github.com/elastic/go-elasticsearch/v8 v8.19.3
 	github.com/elastic/go-ucfg v0.8.8
 	github.com/fxamacker/cbor/v2 v2.8.0
diff --git a/go.sum b/go.sum
index 921658bed..bab272f4a 100644
--- a/go.sum
+++ b/go.sum
@@ -33,17 +33,10 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/elastic/elastic-agent-client/v7 v7.18.0 h1:zXdoErqECfvRjj1c+1Ko4VGuUnFtJfTiC9JJz4aQCHc=
 github.com/elastic/elastic-agent-client/v7 v7.18.0/go.mod h1:ChFjpIfSsQOnhWT3se5Euw/o8P4Vf77FxeObE/vUfSc=
-<<<<<<< HEAD
-github.com/elastic/elastic-agent-libs v0.33.0 h1:DbtU5N8ETw+YII4tqSQSoJcwKC1ReFoFRmCsRNs/lZc=
-github.com/elastic/elastic-agent-libs v0.33.0/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ=
-github.com/elastic/elastic-agent-system-metrics v0.14.0 h1:oqkUg5FZOJsfTptTYQcYh/wEMouYhosUJbNwi4z6OGA=
-github.com/elastic/elastic-agent-system-metrics v0.14.0/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA=
-=======
 github.com/elastic/elastic-agent-libs v0.33.1 h1:ncdg8Tvc1dpQ0FGa1/wm831Qq/oScdpIzNp4D7tok6Q=
 github.com/elastic/elastic-agent-libs v0.33.1/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ=
 github.com/elastic/elastic-agent-system-metrics v0.14.2 h1:OduTwpW4ZiEG3kzMGg31Y0ApJ5fABYFG1U8F5+J3svY=
 github.com/elastic/elastic-agent-system-metrics v0.14.2/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA=
->>>>>>> 7882e49 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.33.0 to 0.33.1 (#6441))
 github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=
 github.com/elastic/elastic-transport-go/v8 v8.8.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
 github.com/elastic/go-elasticsearch/v8 v8.19.3 h1:5LDg0hfGJXBa9Y+2QlUgRTsNJ/7rm7oNidydtFAq0LI=