diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index dd86367..ba476fb 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -27,12 +27,12 @@ public function register(): void
      */
     public function boot(): void
     {
-        Route::bind('barbershop', fn (string $barbershop) => Barbershop::findOrFail(decryptId($barbershop)));
-        Route::bind('user', fn (string $user) => User::findOrFail(decryptId($user)));
-        Route::bind('customer', fn (string $customer) => Customer::findOrFail(decryptId($customer)));
-        Route::bind('service', fn (string $service) => Service::findOrFail(decryptId($service)));
-        Route::bind('expense', fn (string $expense) => Expense::findOrFail(decryptId($expense)));
-        Route::bind('payroll', fn (string $payroll) => Payroll::findOrFail(decryptId($payroll)));
-        Route::bind('cash', fn (string $cash) => Cash::findOrFail(decryptId($cash)));
+        Route::bind('barbershop', fn(string $barbershop) => Barbershop::findOrFail(decryptId($barbershop)));
+        Route::bind('user', fn(string $user) => User::findOrFail(decryptId($user)));
+        Route::bind('customer', fn(string $customer) => Customer::findOrFail(decryptId($customer)));
+        Route::bind('service', fn(string $service) => Service::findOrFail(decryptId($service)));
+        Route::bind('expense', fn(string $expense) => Expense::findOrFail(decryptId($expense)));
+        Route::bind('payroll', fn(string $payroll) => Payroll::findOrFail(decryptId($payroll)));
+        Route::bind('cash', fn(string $cash) => Cash::findOrFail(decryptId($cash)));
     }
 }
diff --git a/resources/views/pages/admin/finance/expenses.blade.php b/resources/views/pages/admin/finance/expenses.blade.php
index b669259..8c5d9da 100644
--- a/resources/views/pages/admin/finance/expenses.blade.php
+++ b/resources/views/pages/admin/finance/expenses.blade.php
@@ -122,6 +122,7 @@ class="form-control rupiah-format @error('amount') is-invalid @enderror" id="amo
                                 @enderror
                             </div>
                             <div class="col-lg-12 position-relative">
+<<<<<<< HEAD
                                 <label class="form-label" for="use_cash">Gunakan Kas</label>
                                 <div class="form-check radio ps-0">
                                     <ul class="radio-wrapper">
@@ -148,6 +149,8 @@ class="form-control rupiah-format @error('amount') is-invalid @enderror" id="amo
                                 @enderror
                             </div>
                             <div class="col-lg-12 position-relative">
+=======
+>>>>>>> 21e2ec04bd9458fd280d8f46f52746684c355e1c
                                 <label class="form-label" for="proof">Bukti
                                     <span class="form-span"><i>(.jpeg,.png,.jpg,.gif,.svg)</i></span>
                                 </label>