diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index f571296a..11e61a59 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -620,10 +620,6 @@ class BookingController extends Controller
             ); 
 
             if($upload_path){
-<<<<<<< HEAD
-
-=======
->>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed
                 $user_bankslip = $booking->userBankSlip()->first();
             
                 // if user bankslip not exist, create new one 
@@ -655,16 +651,12 @@ class BookingController extends Controller
 
         if(!$user_bankslip){
             return response()->json(["message"=> "not found"],400);
-<<<<<<< HEAD
         }
         
         // validate transfer amount exist 
         if(!$request->input('transfer_amount')){
             return response()->json(['message' => 'Please input amount'], 400);
         }
-=======
-		}
->>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed
 		
 		// update booking status 
 		$booking->status = 3;