diff --git a/app/Admin/Controllers/Hr/EmployeeController.php b/app/Admin/Controllers/Hr/EmployeeController.php
index 1d30bb0..fd93d15 100644
--- a/app/Admin/Controllers/Hr/EmployeeController.php
+++ b/app/Admin/Controllers/Hr/EmployeeController.php
@@ -40,22 +40,16 @@ class EmployeeController extends AdminController
                     ->falseValue(EmployeeStatus::Offline),
                 amisMake()->TableColumn()->name('created_at')->label(__('employee.created_at')),
                 $this->rowActions([
-<<<<<<< HEAD
-                    $this->rowShowButton(),
-                    $this->rowEditButton(true),
-                    $this->rowDeleteButton(),
-=======
                     $this->rowShowButton()->visible(Admin::user()->can('admin.hr.employees.view')),
                     $this->rowEditButton(true)->visible(Admin::user()->can('admin.hr.employees.update')),
                     $this->rowDeleteButton()->visible(Admin::user()->can('admin.hr.employees.delete')),
-                    amisMake()->AjaxAction()
-                        ->label(__('employee.leave'))
-                        ->level('link')
-                        ->icon('fa fa-sign-out')
-                        ->confirmText(__('employee.leave_confirm'))
-                        ->api('post:'.admin_url('hr/employees/${id}/leave'))
-                        ->visible(Admin::user()->can('admin.hr.employees.leave')),
->>>>>>> 495824eb8da84ef9a6cb665de688ba3e07329cee
+                    // amisMake()->AjaxAction()
+                    //     ->label(__('employee.leave'))
+                    //     ->level('link')
+                    //     ->icon('fa fa-sign-out')
+                    //     ->confirmText(__('employee.leave_confirm'))
+                    //     ->api('post:'.admin_url('hr/employees/${id}/leave'))
+                    //     ->visible(Admin::user()->can('admin.hr.employees.leave')),
                 ]),
             ]);