diff --git a/config/route.php b/config/route.php
index 8ff4261..413f864 100644
--- a/config/route.php
+++ b/config/route.php
@@ -64,10 +64,7 @@ Route::group('/ticket', function () {
     Route::any('/ticket/add', [app\ticket\controller\TicketController::class, 'add']);
     Route::any('/ticket/edit', [app\ticket\controller\TicketController::class, 'edit']);
     Route::any('/ticket/list', [app\ticket\controller\TicketController::class, 'index']);
-<<<<<<< HEAD
     Route::any('/ticket/self', [app\ticket\controller\TicketController::class, 'self']);
-=======
->>>>>>> feature/crmAdmin0715
     Route::any('/ticket/status', [app\ticket\controller\TicketController::class, 'status']);
     Route::any('/ticket/getStatus', [app\ticket\controller\TicketController::class, 'getStatus']);