diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7df0ded422d..2194b22ab31f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ internal API changes are not present.
 Main (unreleased)
 -----------------
 
-### Features
+### Bugfixes
 
 - Agent Management: Introduce support for templated configuration. (@jcreixell)
 
@@ -139,8 +139,11 @@ v0.38.0 (2023-11-21)
 
 - Allow agent to start with `module.git` config if cached before. (@hainenber)
 
+<<<<<<< HEAD
 ### Bugfixes
 
+=======
+>>>>>>> 853522597 (misc: fix changelog entry (#5812))
 - Set exit code 1 on grafana-agentctl non-runnable command. (@fgouteroux)
 
 - Fixed an issue where `loki.process` validation for stage `metric.counter` was