Update CHANGELOG

Author: rachelekm

CHANGELOG.md

@@ -74,6 +74,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix incorrect topTen tag in preview cards [#795](https://github.com/azavea/echo-locator/pull/795)
 - Offset modals if mobile keyboard open [#774](https://github.com/azavea/echo-locator/pull/774)
 - Clean up following data update [#777](https://github.com/azavea/echo-locator/pull/777)
+<<<<<<< HEAD
 - Update boston school choice link [#778](https://github.com/azavea/echo-locator/pull/778)
+=======
+- Prevent users from unselecting all regions in filters [#794](https://github.com/azavea/echo-locator/pull/794)
+>>>>>>> 234d7d32 (Update CHANGELOG)
 
 ### Removed