fix merge conflicts

workflow/engine/src/ProcessMaker/Model/Task.php

@@ -198,7 +198,6 @@ class Task extends Model
             $join->on('ELEMENT_TASK_RELATION.TAS_UID', '=', 'TASK.TAS_UID')
                 ->where('ELEMENT_TASK_RELATION.ELEMENT_UID', '=', $evnUid);
         });
-
         $query->update(['TASK.TAS_DEF_TITLE' => $caseTitle]);
 
         return $query;
@@ -219,7 +218,12 @@ class Task extends Model
                 ->where('ELEMENT_TASK_RELATION.ELEMENT_UID', '=', $evnUid);
         });
 
-        return $query->get()->values()->toArray()['0']['TAS_DEF_TITLE'];
+        $res = $query->first();
+        if(is_null($res)) {
+            return "";
+        } else {
+            return $res->TAS_DEF_TITLE;
+        }
     }
 
     /**

workflow/engine/src/ProcessMaker/Model/UserExtendedAttributes.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace ProcessMaker\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserExtendedAttributes extends Model
+{
+    protected $table = "USER_EXTENDED_ATTRIBUTES";
+    protected $primaryKey = "UEA_ID";
+    public $incrementing = true;
+    public $timestamps = false;
+
+}