diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6eea892..b102a51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+<<<<<<< HEAD
 ## [5.0.1] - 2021-06-08
+=======
+## [Unreleased]
+>>>>>>> c79960086ab0839845244181cca100eee03ca65e
 
 - Major update!
 - Changed semantic versioning to match version of Grid.js on which it is built to work
@@ -10,8 +14,11 @@ All notable changes to this project will be documented in this file. Dates are d
 - Dropped npm dependencies in favor of unpkg so it can be used entirely on the frontend without bundlers
 - Removed inessential dependencies and lightened the weight of others
 - Simplified the testing procedure
+<<<<<<< HEAD
 
 ## [4.0.0] - 2020-07-14
+=======
+>>>>>>> c79960086ab0839845244181cca100eee03ca65e
 
 ## [0.4.1] - 2020-07-14