diff --git a/Changelog.md b/Changelog.md
index 4a3ad824a..1921d4501 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # 0.0.3.0
 
 ## Refactor