fix changelog

CHANGELOG.md

@@ -32,9 +32,8 @@ Main (unreleased)
 
 - Add relevant golang environment variables to the support bundle (@dehaansa)
 
-<<<<<<< HEAD
 - Logs from underlying clustering library `memberlist` are now surfaced with correct level (@thampiotr)
-=======
+
 - Update mysqld_exporter from v0.15.0 to v0.16.0, most notable changes: (@cristiangreco)
   - Support MySQL 8.4 replicas syntax
   - Fetch lock time and cpu time from performance schema
@@ -43,7 +42,6 @@ Main (unreleased)
   - Fixed parsing of timestamps with non-zero padded days
   - Fix auto_increment metric collection errors caused by using collation in INFORMATION_SCHEMA searches
   - Change processlist query to support ONLY_FULL_GROUP_BY sql_mode
->>>>>>> 5a0176ab6 (move upd to enhancements)
 
 ### Bugfixes