diff --git a/src/App.js b/src/App.js
index aeb4f15..26b15b3 100644
--- a/src/App.js
+++ b/src/App.js
@@ -87,11 +87,6 @@ const App = () => {
             <Th>ФИО</Th>
             <Th>Лаборатория</Th>
             <Th>Время входа</Th>
-<<<<<<< HEAD
-			//<Th>ОФис</Th>
-=======
-		//	<Th>ОФис</Th>
->>>>>>> c743b02ee90be2ef71c4af586bb58ae406edc98f
           </tr>
         </thead>
         <tbody>
@@ -102,7 +97,6 @@ const App = () => {
               <Td>{item.name}</Td>
               <Td>{item.lab}</Td>
               <Td>{item.timeIn}</Td>
-            //  <Td>{item.officeName}</Td>
             </Tr>
           ))}
         </tbody>