diff --git a/debian/changelog b/debian/changelog
index 3ed5139..f828603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-salt-formula-heka (0.1) trusty; urgency=medium
+<<<<<<< HEAD
+=======
+salt-formula-heka (0.2) trusty; urgency=medium
 
-  * Initial release
+  * First public release
 
- -- Jan Kaufman <jan.kaufman@tcpcloud.eu>  Thu, 13 Aug 2015 23:23:41 +0200
+ -- Filip Pytloun <filip.pytloun@tcpcloud.eu>  Wed, 07 Oct 2015 14:02:32 +0200
+