diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32dab05..ac49322 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,4 @@
 # 0.3.2
-<<<<<<< HEAD
-- Updated Ouroboros to 0.10.0 to fix possible UB
-- Remove `Box<T>` from many places in the UVC Backend
-=======
 - Bumped `ouroboros` to avoid potential UB
 - [INTERNAL] Removed `Box<T>` from many internal struct fields of `UVCCaptureDevice`