diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php
index ada665b4e..1c18b6a27 100644
--- a/app/Http/Controllers/Agent/kb/PageController.php
+++ b/app/Http/Controllers/Agent/kb/PageController.php
@@ -2,6 +2,10 @@
 
 namespace App\Http\Controllers\Agent\kb;
 
+<<<<<<< HEAD
+=======
+// controllers
+>>>>>>> origin/master
 use App\Http\Controllers\Agent\helpdesk\TicketController;
 use App\Http\Controllers\Controller;
 // request