diff --git a/debian/changelog b/debian/changelog
index 7ae4f8b..31192ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,3 @@
-python-xstatic-bootswatch (3.3.5.2-2) experimental; urgency=medium
-
-<<<<<<< HEAD
-  * Add patch replace-urls-with-local-path-to-roboto-fonts.patch .
-=======
-  * Add debianize.patch .
->>>>>>> b383ad843de9c482db108229cdc8abb905ce2ab7
-
- -- Ivan Udovichenko <iudovichenko@mirantis.com>  Tue, 08 Sep 2015 2:25:05 +0300
-
 python-xstatic-bootswatch (3.3.5.2-1) experimental; urgency=medium
 
   * Initial release. (Closes: #XXXXXX)