NASER fix conflicts

app/Models/Setting.php

@@ -4,18 +4,24 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Support\Facades\Hash;
+use Rooyesh\Wallet\models\Transaction;
+use Tymon\JWTAuth\Contracts\JWTSubject;
 
 class Setting extends Model
 {
-    use HasFactory;
-    protected $table = 'settings';
+    use HasFactory,Selector;
     protected $fillable = [
         'key',
         'title_fa',
+        'is_active',
+        'description',
         'value',
         'value_json'
     ];
     protected $casts = [
-        'value_json'=>'array'
+        'value_json'=>'array',
+        'is_active'=>'boolean',
     ];
 }