diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 5d2ddf1a..c095741a 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -47,7 +47,13 @@ class BookingController extends Controller
                 break;
         }
 
+<<<<<<< HEAD
         // Calculation Service charge 
+=======
+
+        // Calculation 
+        // Service charge 
+>>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
         $amount = $request->input("amount");
 
          //logic : if amount higher than 10,000, no service charge. if amount lower than 10,000, 20.00 service charge
@@ -229,9 +235,30 @@ class BookingController extends Controller
         $user_po->save();
         return response()->json(['message'=>'Success'],200);
     }
+<<<<<<< HEAD
+=======
+
+    public function update(Request $request, $book_id)
+    {
+            $book_id = Booking::find($book_id);
+
+            $book_id->account_name = $request->input('account_name');
+            $book_id->account_num = $request->input('account_num');
+            $book_id->bank_name = $request->input('bank_name');
+            $book_id->bank_branch = $request->input('bank_branch');
+            $book_id->company_name = $request->input('company_name');
+            $book_id->company_address = $request->input('company_address');
+            $book_id->bank_address = $request->input('bank_address');
+            $book_id->swift_code = $request->input('swift_code');
+            $book_id->cnap = $request->input('cnap');
+            $book_id->save();
+     
+            return response()->json(['book_id'=>$book_id],200);
+    }
+
+>>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
     public function delete(Booking $book_id)
     {
-        $booking = Booking::where('user_id', Auth::user())->where('id', $book_id)->firstOrFail();
         $booking->delete($book_id);
         return response()->json($book_id, 204);
     }
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index f14d3ae6..444c22b5 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,7 +4,15 @@
 
 namespace Composer\Autoload;
 
+<<<<<<< HEAD
 class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
+=======
+<<<<<<< HEAD
+class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
+=======
+class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
+>>>>>>> 9fa55b3394b938349e815fea8c8f6acc5b00fd15
+>>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
 {
     public static $files = array (
         '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
@@ -4749,10 +4757,23 @@ class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
             $loader->prefixLengthsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixDirsPsr4;
             $loader->prefixesPsr0 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixesPsr0;
             $loader->classMap = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$classMap;
+<<<<<<< HEAD
+=======
+=======
+            $loader->prefixLengthsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$classMap;
+>>>>>>> 9fa55b3394b938349e815fea8c8f6acc5b00fd15
+>>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
 
         }, null, ClassLoader::class);
     }