diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5618f5c36146..c8a9386c058d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,9 +10,10 @@ internal API changes are not present.
 Main (unreleased)
 -----------------
 
-### Features
+### Bugfixes
 
-- Add support for Basic Auth-secured connection with Elasticsearch cluster using `prometheus.exporter.elasticsearch`. (@hainenber)
+- Fix default configuration file `grafana-agent-flow.river` used in downstream packages. (@bricewge)
+>>>>>>> bc3babc3b (misc: fix changelog entry (#5812))
 
 v0.38.0-rc.0 (2023-11-16)
 -------------------------
@@ -112,8 +113,6 @@ v0.38.0-rc.0 (2023-11-16)
 
 ### Bugfixes
 
-- Fix default configuration file `grafana-agent-flow.river` used in downstream packages. (@bricewge)
-
 - Set exit code 1 on grafana-agentctl non-runnable command. (@fgouteroux)
 
 - Fixed an issue where `loki.process` validation for stage `metric.counter` was