diff --git a/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx b/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx
index 230034f..9d15ff9 100644
--- a/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx
+++ b/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx
@@ -2,7 +2,10 @@ import React from 'react';
 import styled from 'styled-components';
 import {DeviceUser} from "../../../../../../store/useDeviceStore";
 import {TableScanner} from "./TableScanner";
+<<<<<<< HEAD
 
+=======
+>>>>>>> 26a364aad6dc04d237ff4756cd322508cdffb2b1
 
 const ScanBtn = styled.button`
     position: relative;