fix link & resolve merge conflict

src/current/_data/releases.yml

@@ -6889,6 +6889,33 @@
   source: true
   previous_release: v23.1.27
 
+- release_name: v24.3.0-alpha.2
+  major_version: v24.3
+  release_date: '2024-10-14'
+  release_type: Testing
+  go_version: go1.23.2
+  sha: 45b47f90445fdb0e0c8e07df863c3bbe17daa491
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach-unstable
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v24.3.0-alpha.1
+
 - release_name: v24.1.6
   major_version: v24.1
   release_date: '2024-10-17'

src/current/_includes/releases/v24.1/v24.1.6.md

@@ -11,7 +11,7 @@ Release Date: October 17, 2024
 	- [Kafka sinks]({% link v24.1/changefeed-sinks.md %}#kafka). If [child metrics are enabled]({% link v24.1/cluster-settings.md %}#setting-server-child-metrics-enabled), the metric will have a `kafka` label. 
 	- [Webhook sinks]({% link v24.1/changefeed-sinks.md %}#webhook-sink). If child metrics are enabled, the metric will have a `webhook` label. 
 	- [Pub/Sub sinks]({% link v24.1/changefeed-sinks.md %}#google-cloud-pub-sub). If child metrics are enabled, the metric will have a `pubsub` label. 
-	- [SQL sink]({% link v24.1/changefeed-for.md %}). If child metrics are enabled, the metric will have a `sql` label. [#130583](130583)
+	- [SQL sink]({% link v24.1/changefeed-for.md %}). If child metrics are enabled, the metric will have a `sql` label. [#130583](#130583)
 - Added a `changefeed.total_ranges` metric that can be used to monitor the number of ranges that are watched by [changefeed]({% link v24.1/change-data-capture-overview.md %}) aggregators. It shares the same polling interval as `changefeed.lagging_ranges`, which is controlled by the existing `lagging_ranges_polling_interval` option. [#130983][#130983]
 - Disambiguated [metrics]({% link v24.1/essential-metrics-self-hosted.md %}) and logs for the two buffers used by the KV feed. The following metrics now have a suffix indicating which buffer they correspond to: `changefeed.buffer_entries.*`, `changefeed.buffer_entries_mem.*`, `changefeed.buffer_pushback_nanos.*`. The old versions are kept for backward compatibility, though using the new format is recommended. [#131418][#131418]
 - Added timers around key parts of the [changefeed]({% link v24.1/change-data-capture-overview.md %}) pipeline to help debug feeds experiencing issues. The `changefeed.stage.{stage}.latency` metrics now emit latency histograms for each stage. The metric respects the changefeed `scope` label for debugging specific feeds. [#131429][#131429]