Merge fix

src/pages/ScrapeResults/ScrapeResultsPage.js

@@ -13,13 +13,8 @@ const ScrapeResultsPage = () => {
   const [scrappeDetails, setScrappeDetails] = useState()
 
   useEffect(() => {
-<<<<<<< HEAD
-    getByIdScrappe(location.id)
-      .then(res => {
-=======
     getByIdScrappe(id)
     .then(res => {
->>>>>>> 7774b91b3ce86cc28579305f9cdcae42501ac95c
         setScrappeDetails(res.data)
 
         if (res.data.status === 'done')
@@ -31,10 +26,7 @@ const ScrapeResultsPage = () => {
 
   return (
     <>
-<<<<<<< HEAD
-=======
        {console.log(id)}
->>>>>>> 7774b91b3ce86cc28579305f9cdcae42501ac95c
       <nav className="main-header navbar navbar-expand-md navbar-light navbar-white">
         <div className="container">