resolved merge conflicts

Signed-off-by: singhvibhanshu <singhvibhanshu@hotmail.com>

Author: singhvibhanshu

.chloggen/44484-k8sobjects-api-throttling.yaml

@@ -4,13 +4,13 @@
 change_type: 'enhancement'
 
 # The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
-component: receiver/splunkenterprise
+component: receiver/chrony
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Add custom search support to the Splunk Enterprise receiver
+note: Enables dynamic metric reaggregation in the Chrony receiver. This does not break existing configuration files.
 
 # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
-issues: [47124]
+issues: [46350]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.
@@ -24,4 +24,4 @@ subtext:
 # Include 'user' if the change is relevant to end users.
 # Include 'api' if there is a change to a library API.
 # Default: '[user]'
-change_logs: []
+change_logs: [user, api]

.chloggen/46346-activedirectoryds-enable-reaggregation.yaml

@@ -0,0 +1,6 @@
+change_type: enhancement
+component: receiver/nginx
+note: Enable the re-aggregation feature for the nginx receiver
+issues: [46368]
+subtext:
+change_logs: [user]

…loggen/47124-splunkent-customsearch.yaml …n/46350-chrony-enable-reaggregation.yaml.chloggen/47124-splunkent-customsearch.yaml renamed to .chloggen/46350-chrony-enable-reaggregation.yaml .chloggen/47124-splunkent-customsearch.yaml renamed to .chloggen/46350-chrony-enable-reaggregation.yaml

@@ -1,16 +1,16 @@
 # Use this changelog template to create an entry for release notes.
 
 # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: enhancement
+change_type: breaking
 
 # The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
-component: extension/sumologic
+component: receiver/prometheus
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Adding support to sumologic extension for auto discovery of services in windows
+note: Removes the feature gate `receiver.prometheusreceiver.RemoveLegacyResourceAttributes` which has been stable for some time.
 
 # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
-issues: [47349]
+issues: [47598]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.