conflicts resolve

kivi-cars/src/containers/App.js

@@ -1,10 +1,23 @@
 import './css/App.css';
 import React from 'react';
+import FiltersNav from '../components/Searchfilters/FiltersNav';
+import Header from '../components/Header/Header';
+import ButtonsToolbar from '../components/ButtonsToolbar/ButtonsToolbar';
+import StandardBtn from '../components/Button/StandardBtn';
+import Filters from '../components/Filters/Filters';
+
+
+function App() {
+
+  const info = 'Dobrodosli na stranicu kivi!'
 
 function App() {
 
   return (
     <div className="App">
+      <Header header={info}/>
+      <ButtonsToolbar/>
+
     </div>
   );
 }