diff --git a/changelog b/changelog
index c0a3392..b2a5305 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 quick-jibri-installer (7.2.1)
 
     * changelog: update previous version.