Update go.mod

go.mod

@@ -10,13 +10,8 @@ require (
 	github.com/elastic/apm-data v1.15.0
 	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250102181502-1f91ed31767d
 	github.com/elastic/elastic-agent-client/v7 v7.17.0
-<<<<<<< HEAD
-	github.com/elastic/elastic-agent-libs v0.18.0
-	github.com/elastic/elastic-agent-system-metrics v0.11.6
-=======
 	github.com/elastic/elastic-agent-libs v0.18.1
-	github.com/elastic/elastic-agent-system-metrics v0.11.7
->>>>>>> 915f6876 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.0 to 0.18.1 (#15156))
+	github.com/elastic/elastic-agent-system-metrics v0.11.6
 	github.com/elastic/gmux v0.3.2
 	github.com/elastic/go-docappender/v2 v2.3.3
 	github.com/elastic/go-elasticsearch/v8 v8.17.0