diff --git a/routes/web.php b/routes/web.php
index 577b6d4bf5ddc1cc784d12ef459e7c94c0d26886..e379948237be79d79ee51947e43b30c495a9171f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,6 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use
 /*
 |--------------------------------------------------------------------------
 | Web Routes
@@ -21,17 +20,13 @@
     return view('Login/v_Login');
 })->name('Login');
 
-<<<<<<< Updated upstream
+
 //route for test
 Route::get('/user',[App\Http\Controllers\UserController::class,'Home'])->name('User');
 Route::get('/admin',[App\Http\Controllers\AdminController::class,'Home'])->name('admin');
-<<<<<<< HEAD
 
-=======
+
 Route::get('/user_tranfer',[App\Http\Controllers\UserController::class,'Tranfer'])->name('User_tranfer');
->>>>>>> 99178389a6a72a99c5a5d96069434c0bac0653ed
-=======
 Route::get('/A',function () {
     return view('R/A');
 });
->>>>>>> Stashed changes