diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index caec359f..9b833c18 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -388,6 +388,10 @@ table.dataTable tbody td {
                                         <div class="btn-group dropdown" style="position: relative !important;left:0px !important;top:0px !important;">
                                             <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                             <div class="dropdown-menu dropdown-menu-right" style="cursor: pointer;">
+<<<<<<< HEAD
+                                                <a class="dropdown-item btnEdit" data-id="<?php echo $row->id; ?>"><i data-id="<?php echo $row->id; ?>" class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle btnEdit"></i>Edit</a>
+                                                <a class="dropdown-item btnDelete" data-id="<?php echo $row->id; ?>"><i data-id="<?php echo $row->id; ?>" class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle btnDelete"></i>Delete</a>
+=======
                                                 <a data-toggle="modal" data-target="#con-close-modal" class="dropdown-item btnEdit" data-id="<?php echo $row->id; ?>"><i data-id="<?php echo $row->id; ?>" class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle btnEdit"></i>Edit</a>
                                                 <?php if($row->is_active == 1 && in_array(get_session_userid(), [1, 5])) { ?>
                                                     <a class="dropdown-item btnDelete" data-id="<?php echo $row->id; ?>"><i data-id="<?php echo $row->id; ?>" class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle btnDelete"></i>Delete</a>
@@ -398,6 +402,7 @@ table.dataTable tbody td {
                                                         Activate
                                                     </a>                                                
                                                 <?php } ?>
+>>>>>>> 94f5ea6b9776578981e993cbf3ecbdf032700a8d
                                             </div>
                                         </div>
                                         </td>
@@ -1389,29 +1394,30 @@ form.addEventListener("submit", function(event) {
                 // ✅ Modal stays OPEN — do NOT hide it
 
             } else {
-    // ✅ SUCCESS
-    toastr.success('User saved successfully!', 'Success');
+            // ✅ SUCCESS
+            toastr.success('User saved successfully!', 'Success');
 
-    // ✅ Bootstrap 4 way to close modal
-    $('#con-close-modal').modal('hide');
+            // ✅ Bootstrap 4 way to close modal
+            $('#con-close-modal').modal('hide');
 
-    // Full reset
-    form.reset();
-    $('#UserForm').parsley().reset();
-    $('#UserId').val('');
-    $('#nhance_branch_id').val(null).trigger('change.select2');
-    $('#rm_id').val(null).trigger('change.select2');
-    $('#role').val('').trigger('change');
-    $('#team').multiselect('deselectAll', false);
-    $('#team').multiselect('refresh');
-    $('#email').removeAttr('data-original');
-    $('#mobile').removeAttr('data-original');
-    $('#emp_code').removeAttr('data-original');
-    $('.modal-title').text('Add User');
-    $('#btnSubmit').text('Submit').prop('disabled', false);
+            // Full reset
+            form.reset();
+            $('#UserForm').parsley().reset();
+            $('#UserId').val('');
+            $('#nhance_branch_id').val(null).trigger('change.select2');
+            $('#rm_id').val(null).trigger('change.select2');
+            $('#role').val('').trigger('change');
+            $('#team').multiselect('deselectAll', false);
+            $('#team').multiselect('refresh');
+            $('#email').removeAttr('data-original');
+            $('#mobile').removeAttr('data-original');
+            $('#emp_code').removeAttr('data-original');
+            $('.modal-title').text('Add User');
+            $('#btnSubmit').text('Submit').prop('disabled', false);
+            window.location.reload(); 
 
-    loadUser();
-}
+            loadUser();
+            }
         },
         error: function(xhr) {
             toastr.error('An unexpected error occurred. Please try again.', 'Error');