diff --git a/CHANGES.md b/CHANGES.md
index c5887e75..134e6160 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,11 +2,8 @@
 
 ## [Unreleased]
 
-<<<<<<< HEAD
 - Enable filter extension for `GET /items` requests and add `Queryables` links in `/collections` and `/collections/{collection_id}` responses ([#89](https://github.com/stac-utils/stac-fastapi-pgstac/pull/89))
-=======
 - Add collection search extension
->>>>>>> 9b2050a (add collection search extension)
 
 ## [3.0.0a4] - 2024-07-10