diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1de92663642..2fce0a684b8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1654,21 +1654,8 @@ abstract class CommonObject
         $sql.= " WHERE ";
         if ($justsource || $justtarget)
         {
-<<<<<<< OURS
             if ($justsource) $sql.= "fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."'";
             if ($justtarget) $sql.= "fk_target = '".$targetid."' AND targettype = '".$targettype."'";
-=======
-            if ($justsource)
-            {
-            	$sql.= "fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."'";
-            	if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
-            }
-            else if ($justtarget)
-            {
-            	$sql.= "fk_target = '".$targetid."' AND targettype = '".$targettype."'";
-            	if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
-            }
->>>>>>> THEIRS
         }
         else
         {