diff --git a/network/chat/telepathy-salut/pspec.xml b/network/chat/telepathy-salut/pspec.xml
index bb42526070..2b4498cbd1 100644
--- a/network/chat/telepathy-salut/pspec.xml
+++ b/network/chat/telepathy-salut/pspec.xml
@@ -48,10 +48,7 @@
             <Dependency>telepathy-glib</Dependency>
         </RuntimeDependencies>
         <Files>
-<<<<<<< HEAD
-=======
             <Path fileType="executable">/usr/bin</Path>
->>>>>>> 5b858f0343b6bccaa3bb097ed11fe0a95cd4a98f
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="data">/usr/share/dbus-1</Path>
             <Path fileType="data">/usr/share/telepathy</Path>