From 4ab53faaa1f986b892565cf5f48973e1a15b5640 Mon Sep 17 00:00:00 2001
From: hrodmn <henry.rodman@gmail.com>
Date: Fri, 2 Aug 2024 07:05:13 -0500
Subject: [PATCH] update changelog

---
 CHANGES.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c5887e7..134e616 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