Adjust Mergin

src/App.tsx

-
-import React, { FC } from 'react'
+import React, { FC } from 'react';
 import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
 import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
 import { HomePage } from 'components/HomePage/HomePage';
@@ -11,7 +10,6 @@ import { NotFound } from 'components/NotFound/NotFound';
 import { ProfilePage } from 'components/ProfilePage/ProfilePage';
 import { Roles } from 'components/api/userRoles';
 import { Unauthorized } from 'components/Unauthorized/Unauthorized';
-<<<<<<< HEAD
 
 const theme = createMuiTheme({
   palette: {
@@ -41,9 +39,6 @@ const theme = createMuiTheme({
   },
 });
 
-=======
->>>>>>> 3963f9e8e52654a642bfec3c827f06db43ef8d29
-
 export const App: FC = () => (
   <Router>
     <div data-testid="App">