diff --git a/app/Http/Controllers/Client/helpdesk/UnAuthController.php b/app/Http/Controllers/Client/helpdesk/UnAuthController.php
index 9fc7360c0f..3f665e12a5 100755
--- a/app/Http/Controllers/Client/helpdesk/UnAuthController.php
+++ b/app/Http/Controllers/Client/helpdesk/UnAuthController.php
@@ -331,13 +331,13 @@ public function autoCloseTickets()
      *
      * @return response
      */
-    public static function changeLanguage($ids, $lang)
+    public static function changeLanguage($lang)
     {
-        /* if(Cache::has('language'))
-         {
-           return Cache::get('language');
-         } else return 'false';
-          Cache::put('language',$);
+//        if(Cache::has('language'))
+//         {
+//           return Cache::get('language');
+//         } else return 'false';
+//          Cache::put('language',$);
          $path = base_path('lang');  // Path to check available language packages
          if (array_key_exists($lang, \Config::get('languages')) && in_array($lang, scandir($path))) {
              // dd(array_key_exists($lang, Config::get('languages')));
@@ -352,9 +352,7 @@ public static function changeLanguage($ids, $lang)
 
         return true;
 
-        */
-
-        $path = base_path('lang');  // Path to check available language packages
+      /*  $path = base_path('lang');  // Path to check available language packages
         if (array_key_exists($lang, \Config::get('languages')) && in_array($lang, scandir($path))) {
             if (Auth::check()) {
                 $id = Auth::user()->id;
@@ -366,7 +364,7 @@ public static function changeLanguage($ids, $lang)
             }
         }
 
-        return redirect()->back();
+        return redirect()->back();*/
     }
 
     // Follow up tickets
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
index c801ff75be..101eb79b72 100755
--- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
@@ -139,29 +139,23 @@ class="nav-link active"
             if ($group->can_edit_ticket == 1) {
                 ?>
             <button type="button" class="btn btn-sm btn-default btn-tool">
-<<<<<<< HEAD
+
                 <i class="fas fa-edit" style="color:green;"></i> {{trans('lang.edit')}}
-=======
-                <i class="fas fa-edit" style="color:green;"></i> Edit
->>>>>>> 8b838c20f (changes)
+
             </button>            <?php } ?>
 
             <?php if ($group->can_assign_ticket == 1) { ?>
             <button type="button" class="btn btn-sm btn-default btn-tool">
-<<<<<<< HEAD
+
                 <i class="fas fa-hand-point-right" style="color:orange;"></i> {{trans('lang.assign')}}
-=======
-                <i class="fas fa-hand-point-right" style="color:orange;"></i> Assign
->>>>>>> 8b838c20f (changes)
+
             </button>            <?php } ?>
 
             @if($tickets->assigned_to == Auth::user()->id)
                 <button type="button" id="surrender_button" class="btn btn-sm btn-default btn-tool" data-toggle="modal" data-target="#surrender">
-<<<<<<< HEAD
+
                     <i class="fas fa-arrows-alt" style="color:red;"></i> {{trans('lang.surrender')}}
-=======
-                    <i class="fas fa-arrows-alt" style="color:red;"></i> Surrender
->>>>>>> 8b838c20f (changes)
+
                 </button>
             @endif
 
@@ -169,11 +163,9 @@ class="nav-link active"
             <?php \Illuminate\Support\Facades\Event::dispatch('show-add-event-btn', []); ?>
 
             <a href="{{url('ticket/print/'.$tickets->id)}}" target="_blank" class="btn btn-default btn-tool btn-sm">
-<<<<<<< HEAD
+
                 <i class="fas fa-print"></i> {{trans('lang.generate_pdf')}}
-=======
-                <i class="fas fa-print"></i> Generate PDF
->>>>>>> 8b838c20f (changes)
+
             </a>            <div class="btn-group">
                 <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" id="d1"><i class="fas fa-exchange-alt" style="color:teal;" id="hidespin"> </i><i class="fa fa-spinner fa-spin" style="color:teal; display:none;" id="spin"></i>
                     {!! Lang::get('lang.change_status') !!} <span class="caret"></span>
diff --git a/routes/web.php b/routes/web.php
index a1d7f55b74..89fcf7247b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -806,7 +806,7 @@
     // });
     Route::get('check_ticket/swtich-language/{id}', [Client\helpdesk\UnAuthController::class, 'changeUserLanguage']);
     Route::get('category-list/swtich-language/{id}', [Client\helpdesk\UnAuthController::class, 'changeUserLanguage']);
-    Route::get('show-ticket/{ids}/swtich-language/{id}', [Client\helpdesk\UnAuthController::class, 'changeLanguage']);
+    Route::get('show/swtich-language/{id}', [Client\helpdesk\UnAuthController::class, 'changeUserLanguage']);
     Route::get('pages/swtich-language/{id}', [Client\helpdesk\UnAuthController::class, 'changeUserLanguage'])->name('switch-user-lang');
     Route::get('swtich-language/{id}', [Client\helpdesk\UnAuthController::class, 'changeUserLanguage'])->name('switch-user-lang');
     Route::get('thread/swtich-language/{id}', [Client\helpdesk\UnAuthController::class, 'changeUserLanguage'])->name('switch-user-lang');