fixed some merge conflicts and errors on my part

src/component/Main.jsx

@@ -24,7 +24,7 @@ export default function Main() {
         <AuthRoute exact path="/products/new">
           <ProductForm method="POST" />
         </AuthRoute>
-        <AuthRoute exact path="/products/edit/:sku">
+        <AuthRoute exact path="/products/edit/:productId">
           <ProductForm method="PUT" />
         </AuthRoute>
         <AuthRoute

src/component/ProductForm.jsx

 import React, { useEffect, useState } from "react";
 import { useHistory, useParams } from "react-router";
 import emptyProduct from "../emptProduct";
+import Config from '../config';
 
 const emptyForm = {
   ...emptyProduct,
@@ -78,7 +79,7 @@ export default function ProductForm(props) {
       // console.log(form);
       const url =
         method === "PUT"
-          ? `${Config.inventoryUrl}/${sku}`
+          ? `${Config.inventoryUrl}/${productId}`
           : `${Config.inventoryUrl}`;
       fetch(url, {
         method,