resolve conflict

app/Models/HumanResource.php

@@ -33,6 +33,7 @@ class HumanResource extends Model
         'updated_at', 
         'updated_by',
         'divisi_id',
-        'status_boundary'
+        'status_boundary',
+        'company_id'
     ];
 }