diff --git a/src/api/helpers/BeanLoader.php b/src/api/helpers/BeanLoader.php
index 0dc5868..9254b7b 100644
--- a/src/api/helpers/BeanLoader.php
+++ b/src/api/helpers/BeanLoader.php
@@ -177,7 +177,11 @@ class BeanLoader {
             foreach ($data->assignees as $assignee) {
                 $user = R::load('user', $assignee->id);
 
+<<<<<<< HEAD
                 if ((int)$user->id) {
+=======
+                if ((int) $user->id) {
+>>>>>>> a7569450aa54ac34b66b15dac66d0ea95dac7cb4
                     $task->sharedUserList[] = $user;
                 }
             }