diff --git a/src/LaravelGoogleDriveStorageServiceProvider.php b/src/LaravelGoogleDriveStorageServiceProvider.php
index 5cbbbf3..2b59240 100644
--- a/src/LaravelGoogleDriveStorageServiceProvider.php
+++ b/src/LaravelGoogleDriveStorageServiceProvider.php
@@ -28,8 +28,6 @@ public function configurePackage(Package $package): void
     public function bootingPackage()
     {
         try {
-<<<<<<< HEAD
-=======
             app()->config['filesystems.disks.google'] = [
                 'driver' => 'google',
                 'clientId' => env('GOOGLE_DRIVE_CLIENT_ID'),
@@ -39,7 +37,6 @@ public function bootingPackage()
                 //'teamDriveId' => env('GOOGLE_DRIVE_TEAM_DRIVE_ID'),
             ];
 
->>>>>>> development
             Storage::extend('google', function ($app, $config) {
                 $options = [];