diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 01adfb8af173..48a7d1cc04fe 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -44,6 +44,19 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 - Add fonts to support more different types of characters for multiple languages. {pull}29861[29861]
 
+- auditd: Add error.message to events when processing fails. {pull}30009[30009]
+
+*Filebeat*
+
+- tcp/unix input: Stop accepting connections after socket is closed. {pull}29712[29712]
+- Fix using log_group_name_prefix in aws-cloudwatch input. {pull}29695[29695]
+- aws-s3: fix race condition in states used by s3-poller. {issue}30123[30123] {pull}30131[30131]
+- cisco module: Fix change the broke ASA and FTD configs that used `var.input: syslog`. {pull}30072[30072]
+- Fix broken Kafka input {issue}29746[29746] {pull}30277[30277]
+
+
+*Heartbeat*
+
 *Metricbeat*
 
 
diff --git a/x-pack/filebeat/module/cisco/asa/config/input.yml b/x-pack/filebeat/module/cisco/asa/config/input.yml
index 4237b4d9ae21..96eb88bc5d49 100644
--- a/x-pack/filebeat/module/cisco/asa/config/input.yml
+++ b/x-pack/filebeat/module/cisco/asa/config/input.yml
@@ -13,6 +13,19 @@ paths:
 {{ end }}
 exclude_files: [".gz$"]
 
+<<<<<<< HEAD
+=======
+{{ else if eq .input "syslog" }}
+type: udp
+host: "{{.syslog_host}}:{{.syslog_port}}"
+
+{{ else }}
+
+type: {{.input}}
+host: "{{.syslog_host}}:{{.syslog_port}}"
+ssl: {{ .ssl | tojson }}
+
+>>>>>>> 3ddfd1f063 ([Filebeat] Fix Cisco ASA/FTD configs that used var.input syslog (#30072))
 {{ end }}
 
 tags: {{.tags | tojson}}
diff --git a/x-pack/filebeat/module/cisco/ftd/config/input.yml b/x-pack/filebeat/module/cisco/ftd/config/input.yml
index b29aa4c725f7..9f7af7465036 100644
--- a/x-pack/filebeat/module/cisco/ftd/config/input.yml
+++ b/x-pack/filebeat/module/cisco/ftd/config/input.yml
@@ -12,6 +12,19 @@ paths:
 {{ end }}
 exclude_files: [".gz$"]
 
+<<<<<<< HEAD
+=======
+{{ else if eq .input "syslog" }}
+type: udp
+host: "{{.syslog_host}}:{{.syslog_port}}"
+
+{{ else }}
+
+type: {{.input}}
+host: "{{.syslog_host}}:{{.syslog_port}}"
+ssl: {{ .ssl | tojson }}
+
+>>>>>>> 3ddfd1f063 ([Filebeat] Fix Cisco ASA/FTD configs that used var.input syslog (#30072))
 {{ end }}
 
 tags: {{.tags | tojson}}