#14: Fixed merge conflict

client/package.json

@@ -4,10 +4,7 @@
   "private": true,
   "dependencies": {
     "@material-ui/core": "^4.11.3",
-<<<<<<< HEAD
     "@material-ui/icons": "^4.11.2",
-=======
->>>>>>> 186d707ace54d27ff8913eff2be29026e64afb43
     "@material-ui/lab": "^4.0.0-alpha.57",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^11.2.5",

client/src/App.tsx

@@ -9,19 +9,7 @@ const App: React.FC = () => {
         rel="stylesheet"
         href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
       />
-<<<<<<< HEAD
       <Main />
-=======
-      <h1>Application</h1>
-      <TestConnection />
-      <BrowserRouter>
-        <Switch>
-          <Route path="/">
-            <LoginForm />
-          </Route>
-        </Switch>
-      </BrowserRouter>
->>>>>>> 186d707ace54d27ff8913eff2be29026e64afb43
     </div>
   )
 }