diff --git a/include/class.collaborator.php b/include/class.collaborator.php
index abf0a52a4e00e0d56ac22ace0673a9367b6458a8..b8adb93262d1dba483457b7decd82b8af7dd6078 100644
--- a/include/class.collaborator.php
+++ b/include/class.collaborator.php
@@ -44,24 +44,11 @@ class Collaborator extends TicketUser {
         return $this->load();
     }
 
-<<<<<<< HEAD
-    function __call($name, $args) {
-
-        if(!($user=$this->getUser()) || !method_exists($user, $name))
-            return false;
-
-        return  $args
-            ? call_user_func_array(array($user, $name), $args)
-            : call_user_func(array($user, $name));
-    }
-
     function __toString() {
         return Format::htmlchars(sprintf('%s <%s>', $this->getName(),
                     $this->getEmail()));
     }
 
-=======
->>>>>>> efe5b0f... Make collaborator extends ticket user  - necessary for authtoken support
     function getId() {
         return $this->ht['id'];
     }