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