merge conflict with master

src/emptProduct.js

@@ -9,5 +9,4 @@ const emptyProduct = {
   productDesciption: "",
   productImageUrl: "",
 };
-
-export default emptyProduct;
+export default emptyProduct;
\ No newline at end of file

src/index.js

@@ -12,10 +12,11 @@ storage.setItem("loggedIn", "false");
 ReactDOM.render(
   <React.StrictMode>
     <BrowserRouter>
-      <App />
+    <App />
     </BrowserRouter>
+
   </React.StrictMode>,
-  document.getElementById("root")
+  document.getElementById('root')
 );
 
 // If you want to start measuring performance in your app, pass a function