fix merge conflicts

CHANGELOG.next.asciidoc

@@ -108,20 +108,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Lower logging level to debug when attempting to configure beats with unknown fields from autodiscovered events/environments {pull}[37816][37816]
 - Set timeout of 1 minute for FQDN requests {pull}37756[37756]
 - Fix issue where old data could be saved in the memory queue after acknowledgment, increasing memory use {pull}41356[41356]
-- Fix the paths in the .cmd script added to the path by the Windows MSI to point to the new C:\Program Files installation location. https://github.com/elastic/elastic-stack-installers/pull/238
-- Change cache processor documentation from `write_period` to `write_interval`. {pull}38561[38561]
-- Fix cache processor expiries heap cleanup on partial file writes. {pull}38561[38561]
-- Fix cache processor expiries infinite growth when large a large TTL is used and recurring keys are cached. {pull}38561[38561]
-- Fix parsing of RFC 3164 process IDs in syslog processor. {issue}38947[38947] {pull}38982[38982]
-- Rename the field "apache2.module.error" to "apache.module.error" in Apache error visualization. {issue}39480[39480] {pull}39481[39481]
-- Validate config of the `replace` processor {pull}40047[40047]
-- Allow port number 0 in the community ID flowhash processor {pull}40259[40259]
-- Fix handling of escaped brackets in syslog structured data. {issue}40445[40445] {pull}40446[40446]
-- Update Go version to 1.22.6. {pull}40528[40528]
-- Aborts all active connections for Elasticsearch output. {pull}40572[40572]
-- Closes beat Publisher on beat stop and by the Agent manager. {pull}40572[40572]
-- The journald input now restarts if there is an error/crash {issue}32782[32782] {pull}40558[40558]
-- Fix Elasticsearch output not recovering from network errors {issue}40705[40705] {pull}40794[40794]
 - Ensure Elasticsearch output can always recover from network errors {pull}40794[40794]
 
 *Auditbeat*