Resolve remaining merge conflicts

app/Http/Controllers/PampasanController.php

@@ -70,11 +70,6 @@ class PampasanController extends Controller
         Palsu::on($cawangan['mysql'])
             ->where('norujukan', $norujukan)
             ->update(['status' => 1]);
-<<<<<<< HEAD
-=======
-
-        // dd($pampasan);
->>>>>>> 83d619ac (Continue dev on pampasan module)
 
         return $this->successResponse('Status Pampasan berjaya dituntut.', $pampasan, 201);
     }

app/Palsu.php

@@ -32,10 +32,6 @@ class Palsu extends Model
         'untungonepercent',
         'untungcajlain',
         'pembiayaan',
-<<<<<<< HEAD
-=======
-        'jenis',
->>>>>>> 83d619ac (Continue dev on pampasan module)
         'status',
     ];
 
@@ -99,12 +95,9 @@ class Palsu extends Model
     {
         return $this->hasOne(Tebus::class, 'norujukan', 'norujukan');
     }
-<<<<<<< HEAD
     
     public function gadai(): HasOne
     {
         return $this->hasOne(Gadai::class, 'norujukan', 'norujukan');
     }
-=======
->>>>>>> 83d619ac (Continue dev on pampasan module)
 }