fix bad merge

1 files changed, 3 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3c95ae0a..595d705c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,14 +6,14 @@
 - Feature: Adding a file named `root_manifest.ignore_schema_mismatch` in the root of zenserver data dir prevents wipe of data when schema mismatches
 - Improvement: Removed `zen runtests` command since it's no longer useful
 - Improvement: Simplified zenserver-test code by implementing dynamic port assignment, and also implemented transparent handling of port relocation for increased test robustness against environmental differences and socket lifetime 'noise'
-- Improvement: Event implementation now uses `std::atomic_bool` instead of `volatile bool` for correctness
-- Improvement: `ProcessHandle::Wait` no longer returns without calling `kill`
-- Improvement: Posix event implementation is now more robust and works around apparent condition variable issue
 
 ## 0.2.34
 - Bumped zenserver data schema (to '5') to wipe corrupted state caused by version 0.2.31/0.2.32
 - Bugfix: Fix hang on ZenServerInstance shutdown on Mac/Linux
+- Improvement: Event implementation now uses `std::atomic_bool` instead of `volatile bool` for correctness
 - Improvement: Removed dependency on cxxopts exception types, to enable use of library versions >3.0.0
+- Improvement: Posix event implementation is now more robust and works around apparent condition variable issue
+- Improvement: `ProcessHandle::Wait` no longer returns without calling `kill`
 - Improvement: We now set Sentry to `<username>@<hostname>` if personal information is allowed to be sent
 - Improvement: Make object store endpoint S3 compatible.