diff --git a/debian/changelog b/debian/changelog
index 4c183ab..68ad983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ kpimtextedit (16.04.0-0ubuntu1) UNRELEASED; urgency=medium
   * Add missing file. 
   * Fix merge markers. 
 
+  [ Rik Mills ]
+  * Fix merge markers, including file kpimtexteditwidgets.so
+
  -- Scarlett Clark <sgclark@kubuntu.org>  Sun, 01 May 2016 20:16:37 -0700
 
 kpimtextedit (15.12.3-0ubuntu1) xenial; urgency=medium
diff --git a/debian/libkf5pimtextedit5.install b/debian/libkf5pimtextedit5.install
index 3434e74..84c8465 100644
--- a/debian/libkf5pimtextedit5.install
+++ b/debian/libkf5pimtextedit5.install
@@ -1,6 +1,3 @@
 usr/lib/*/libKF5PimTextEdit.so.5
 usr/lib/*/libKF5PimTextEdit.so.5.*
-<<<<<<< HEAD
 usr/lib/*/qt5/plugins/designer/kpimtexteditwidgets.so
-=======
->>>>>>> origin/kubuntu_stable