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