chore(CHANGELOG): remove merge conflict artifact

Signed-off-by: hainenber <[email protected]>

CHANGELOG.md

@@ -35,29 +35,6 @@ Main (unreleased)
 
 ### Bugfixes
 
-- Agent Management: Introduce support for templated configuration. (@jcreixell)
-
-### Enhancements
-
-- Flow Windows service: Support environment variables. (@jkroepke)
-
-- Allow disabling collection of root Cgroup stats in
-  `prometheus.exporter.cadvisor` (flow mode) and the `cadvisor` integration
-  (static mode). (@hainenber)
-
-- Grafana Agent on Windows now automatically restarts on failure. (@hainenber)
-
-- Added metrics, alerts and dashboard visualisations to help diagnose issues
-  with unhealthy components and components that take too long to evaluate. (@thampiotr)
-
-- The `http` config block may now reference exports from any component.
-  Previously, only `remote.*` and `local.*` components could be referenced
-  without a circular dependency. (@rfratto)
-
-- Add support for Basic Auth-secured connection with Elasticsearch cluster using `prometheus.exporter.elasticsearch`. (@hainenber)
-
-### Bugfixes
-
 - Permit `X-Faro-Session-ID` header in CORS requests for the `faro.receiver`
   component (flow mode) and the `app_agent_receiver` integration (static mode).
   (@cedricziel)