diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index dc438e4..d4cdac4 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -248,10 +248,6 @@ class GadaiController extends Controller
         $total_nilai_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('n_marhun');
         $total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat');
 
-<<<<<<< HEAD
-        $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
-
-=======
         //query kadar upah baru
         $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawagan['group_id'])->first();
 
@@ -260,7 +256,6 @@ class GadaiController extends Controller
         // query kadar upah lama
         // $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
         
->>>>>>> f15cf924e7152a396316ea99d81e2535c56977f0
         $onepercentservices = new OnePercentServices();
         $keuntungan = $onepercentservices->kiraanKeuntunganSebenar($request->pinjaman,$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjam);
         // $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);