diff --git a/changelog.md b/changelog.md
index b8f05f94620cc9161c664ab8d4846f44bd3c1339..946f824b162380523ed3ab90e8cc22fdb53877c3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> release/0.1
 # Changelog
 
 All notable changes to this project will be documented in this file.