diff --git a/client.cpp b/client.cpp
index 59b6989eec..d6a9e0612d 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1519,10 +1519,7 @@ void Client::setOnActivity(const QString &activity, bool enable)
 /**
  * set exactly which activities this client is on
  */
-<<<<<<< HEAD
 // cloned from kactivities/src/lib/core/consumer.cpp
-=======
->>>>>>> Map NULL_UUID activity to ALL activities
 #define NULL_UUID "00000000-0000-0000-0000-000000000000"
 void Client::setOnActivities(QStringList newActivitiesList)
 {