diff --git a/CHANGELOG b/CHANGELOG
index d606f7b1..3f51f62b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,19 +1,9 @@
-<<<<<<< HEAD
 2023-09-17 v9.0.0
 - Remove GeoJSONLD Render Functions
 - Remove MBTiles Render Functions
 - Rewrite confrom to natively output GeoJSON+LD
 - Rewrite Preview module to expect GeoJSON+LD
 
-2023-09-06 v8.3.0
-- Update to next major alpine version
-- Remove mock library in favour of unittest.mock
-- Update all python deps to latest versions
-
-2023-09-05 v8.2.4
-- Update TippeCanoe to latest version
-- Make GeoJSON+LD output a default
-=======
 2023-09-09 v8.3.1
 - Use the file extension from the content-type header when it disagrees with content-disposition in https://github.com/openaddresses/batch-machine/pull/54
 
@@ -21,8 +11,10 @@
 - Update Mapbox Vector Tile dependency in https://github.com/openaddresses/batch-machine/pull/52
 - Make GeoJSON+LD output a default in https://github.com/openaddresses/batch-machine/pull/51
 - Update TippeCanoe to latest version in https://github.com/openaddresses/batch-machine/pull/50
->>>>>>> 4f57e3e6be53695ef0a4a8db60139154de09b6cf
 
+2023-09-05 v8.2.4
+- Update TippeCanoe to latest version
+- Make GeoJSON+LD output a default
 2023-09-02 v8.2.3
 - Fix properties in geojson-ld features in https://github.com/openaddresses/batch-machine/pull/49
 - Remove extra whitespace in geojson-ld output in https://github.com/openaddresses/batch-machine/pull/48