diff --git a/debian/changelog b/debian/changelog
index b604c53..f828603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,5 @@
-
+<<<<<<< HEAD
+=======
 salt-formula-heka (0.2) trusty; urgency=medium
 
   * First public release