resolve conflicts

kivi-cars/src/containers/App.css

@@ -7,4 +7,8 @@
 .App{
   display: flex;
   flex-direction: column;
+}
+
+p, h1, h2, h3 ,h4 {
+  font-family: Arial, Helvetica, sans-serif;
 }

kivi-cars/src/containers/App.js

@@ -1,6 +1,6 @@
 import './App.css';
 import React from 'react';
-import Filters from '../components/Filters';
+import FiltersNav from '../components/Searchfilters/FiltersNav';
 import Header from '../components/Header/Header';
 import ButtonsToolbar from '../components/ButtonsToolbar/ButtonsToolbar';
 import StandardBtn from '../components/Button/StandardBtn'
@@ -13,10 +13,10 @@ function App() {
     <div className="App">
       <Header header={info}/>
       <ButtonsToolbar/>
+      <FiltersNav />
       <StandardBtn/>
-      
+
     </div>
- 
   );
 }