diff --git a/CHANGELOG.md b/CHANGELOG.md
index d64475dd3..8a69763bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,17 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
-=======
-## [3.21.1] - 2024-03-29
-
-### Added
-
-### Removed
-
-### Changed
-
-### Fixed
 
 ## [3.22.0] - 2024-03-15
 
@@ -38,7 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixed packets received check on Safari 17.3 and below
 
->>>>>>> 4a9dd149 (Fixed packets received check on Safari 17.3 and below (#2868))
 ## [3.21.0] - 2024-02-12
 
 ### Added