diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 9b833c18..59bba538 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -388,11 +388,7 @@ 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>
                                                  <?php } ?>
@@ -402,7 +398,6 @@ table.dataTable tbody td {
                                                         Activate
                                                     </a>                                                
                                                 <?php } ?>
->>>>>>> 94f5ea6b9776578981e993cbf3ecbdf032700a8d
                                             </div>
                                         </div>
                                         </td>