fix merge conflict (#5120)

Signed-off-by: Edward Welch <[email protected]>

Co-authored-by: Karen Miller <[email protected]>

docs/sources/release-notes/v2-4.md

@@ -31,7 +31,9 @@ Please read the [upgrade guide](../../upgrading/#240) before updating Loki.
 We made a lot of changes to Loki’s configuration as part of this release.
 We have tried our best to make sure changes are compatible with existing configurations, however some changes to default limits may impact users who didn't have values explicitly set for these limits in their configuration files.
 
-Here is a list of limit defaults that have changed:
+### v2.4.0 changes to defaults
+
+Here is a list of limit defaults that have changed in v2.4.0:
 
 | config | new default | old default |
 | --- | --- | --- |
@@ -47,11 +49,39 @@ Here is a list of limit defaults that have changed:
 
 We have enabled the [in-memory FIFO cache by default](https://github.com/grafana/loki/pull/4519) when no existing external cache is configured. This helps improve Loki's performance, however it will also allow Loki to consume more memory.
 
+### v2.4.2 changes to defaults
+
+Here is a list of limit defaults that have changed in v2.4.2, add in [PR 5077](https://github.com/grafana/loki/pull/5077):
+
+| config | new default | old default |
+| --- | --- | --- |
+| parallelise_shardable_queries | true | false |
+| split_queries_by_interval | 30m | 0s |
+| query_ingesters_within | 3h | 0s |
+| max_chunk_age | 2h | 1h |
+| max_concurrent | 10 | 20 |
+
 ## Bug fixes
 
+### 2.4.2 bug fixes
+2.4.2 fixes these bugs:
+
+- [PR 4968](https://github.com/grafana/loki/pull/4968) **trevorwhitney**: Fixes a bug in which querying ingesters wrongly returns a ruler,
+causing the internal server error `code = Unimplemented`.
+- [PR 4875](https://github.com/grafana/loki/pull/4875) **trevorwhitney**: Honor the replication factor specified in the common configuration block when `memberlist` is the consistent hash ring store.
+- [PR 4792](https://github.com/grafana/loki/pull/4792) **AndreZiviani**: Corrects the default values of configuration options in the documentation for:
+    - `scheduler_dns_lookup_period` 
+    - `min_ready_duration` 
+    - `final_sleep` 
+    - `max_transfer_retries` 
+    - `chunk_retain_period` 
+    - `chunk_target_size` 
+    - `batch_size` 
+    - `timeout` (for Redis requests) 
+
 ### 2.4.1 bug fixes
 
-2.4.1 fixes two important bugs in the 2.4.0 release:
+2.4.1 fixes two bugs in the 2.4.0 release:
 
 * [PR 4687](https://github.com/grafana/loki/pull/4687) **owen-d**: Eliminate a compactor panic when not using a tenant overrides file.
 * [PR 4681](https://github.com/grafana/loki/pull/4681) **slim-bean**: Correct the initialization of the `read` target. Incorrect initialization resulted in query gaps after a chunk was flushed and before the querier downloaded new index tables.