diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index dfe0770..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
diff --git a/public/index.html b/public/index.html
index f47f345..ba3a2fe 100644
--- a/public/index.html
+++ b/public/index.html
@@ -26,6 +26,7 @@
     -->
     <!--Google fonts-->
     <link href="https://fonts.googleapis.com/css?family=Oswald|Roboto&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Rubik:wght@900&display=swap" rel="stylesheet">
 <!--FontAwesome-->
     <link rel="stylesheet" href="//use.fontawesome.com/releases/v5.0.7/css/all.css">
     <!--<script src="https://use.fontawesome.com/9e4f30b371.js"></script>-->
diff --git a/src/App.css b/src/App.css
index 23073ec..e6bc56d 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,9 +1,15 @@
 :root{
-  --mainGrey: #BABBC5 ;
+  --mainGrey: #d9d9d9;
   --LightGrey: #e8e8e8;
-  --mainWhite: #f3f3f3;
+<<<<<<< HEAD
+  --mainWhite: #ffffff;
   --mainDark: #0E1024 ;
   --mainBlue: #C94343 ;
+=======
+  --mainWhite: #f3f3f3;
+  --mainDark: #828282;
+  --mainBlue: #1414ff;
+>>>>>>> parent of 33ca9fa... Changing products and updates
 }
 
 body{
@@ -13,11 +19,16 @@ body{
 }
 
 .text-title{
-  font-family: "Oswald", sans-serif;
+  font-family: 'Rubik', sans-serif;
   letter-spacing: 0.3rem;
   text-transform: uppercase;
 }
 
+.company-name{
+  font-family: 'Rubik', sans-serif !important;
+  font-size: 0.8rem !important;
+}
+
 .text-blue{
   color:var(--mainBlue);
 }
diff --git a/src/App.js b/src/App.js
index cc855b8..4097287 100644
--- a/src/App.js
+++ b/src/App.js
@@ -18,6 +18,9 @@ function App() {
             <Route path="/details" component={Details} />
             <Route path="/cart" component={Cart} />
             <Route component={Default} />
+
+
+
         </Switch>
         <Modal />
     </React.Fragment>
diff --git a/src/components/Cart.js b/src/components/Cart.js
deleted file mode 100644
index dbcb7bc..0000000
--- a/src/components/Cart.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React, {Component} from 'react';
-
-export default class Cart extends Component {
-    render() {
-        return (
-            <div>
-<h3>hello from cart</h3>
-            </div>
-        );
-    }
-}
-
diff --git a/src/components/Cart/CartTotals.js b/src/components/Cart/CartTotals.js
index 70d20b2..e776f8d 100644
--- a/src/components/Cart/CartTotals.js
+++ b/src/components/Cart/CartTotals.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import {Link} from "react-router-dom";
-import NumberFormat from 'react-number-format';
 
 export default function CartTotals({value}) {
     const{cartSubtotal, cartTax, cartTotal, clearCart} = value;
@@ -21,41 +20,18 @@ export default function CartTotals({value}) {
                             <span className="text-title">
                                 subtotal:
                             </span>
-                            <NumberFormat
-                                value={cartSubtotal}
-                                displayType={'text'}
-                                thousandSeparator={true}
-                                prefix={'$'}
-                                decimalScale ={2}
-                                fixedDecimalScale ={true}
-                                renderText={cartSubtotal => <strong>{cartSubtotal}</strong>} />
-
+                            <strong>$ {cartSubtotal}</strong>
                         </h5>
                         <h5>
                             <span className="text-title">
                                 tax:
-                            </span>
-                            <NumberFormat
-                            value={cartTax}
-                            displayType={'text'}
-                            thousandSeparator={true}
-                            prefix={'$'}
-                            decimalScale ={2}
-                            fixedDecimalScale ={true}
-                            renderText={cartTax => <strong>{cartTax}</strong>} />
+                            </span><strong>$ {cartTax}</strong>
                         </h5>
                         <h5>
                             <span className="text-title">
                                 Total:
                             </span>
-                            <NumberFormat
-                                value={cartTotal}
-                                displayType={'text'}
-                                thousandSeparator={true}
-                                prefix={'$'}
-                                decimalScale ={2}
-                                fixedDecimalScale ={true}
-                                renderText={cartTotal => <strong>{cartTotal}</strong>} />
+                            <strong>$ {cartTotal}</strong>
                         </h5>
                     </div>
                 </div>
diff --git a/src/components/Details.js b/src/components/Details.js
index a09f236..ee59df9 100644
--- a/src/components/Details.js
+++ b/src/components/Details.js
@@ -2,7 +2,6 @@ import React, {Component} from 'react';
 import {ProductConsumer} from '../Context'
 import {Link} from "react-router-dom";
 import {ButtonContainer} from "./Button";
-import NumberFormat from 'react-number-format';
 
 export default class Details extends Component {
     render() {
@@ -15,24 +14,26 @@ export default class Details extends Component {
                             {/*TITLE*/}
                             <div className="row">
                                 <div className="col-10 mx-auto text-center text-blue text-slanted my-5">
-                                    <h1>{title}</h1>
+                                    <h1 className="text-title">{title}</h1>
                                 </div>
                             </div>
                             {/*TITLE*/}
                             {/*Product info*/}
                             <div className="row">
-                                <div className="col-10 mx-auto col-md-6 my-3 text-capitalize">
+                                <div className="col-10 mx-auto col-md-6 my-3 ">
                                     <img src={img} className="img-fluid" alt="product"/>
                                 </div>
+
                                 {/*Product text*/}
 
-                                <div className="col-10 mx-auto col-md-6 my-3 text-capitalize">
+                                <div className="col-10 mx-auto col-md-6 my-3 text-capitalize px-5">
                                     <h2> model: {title}</h2>
-                                    <h4 className="text-title text-uppercase text-muted mt-3 mb-2">
+                                    <h4 className=" text-uppercase mt-3 mb-2">
                                         made by: <span className="text-uppercase">
                                         {company}</span>
                                     </h4>
-
+<<<<<<< HEAD
+<hr/>
                                     <h4 className="text-blue">
                                         <strong>
                                             <NumberFormat
@@ -45,11 +46,14 @@ export default class Details extends Component {
                                                 renderText={price => <span>{price}</span>} />{/*<span>${price}</span>*/}
                                         </strong>
                                     </h4>
+=======
+                                    <h4 className="text-blue"><strong><span>${price}</span></strong></h4>
+>>>>>>> parent of 33ca9fa... Changing products and updates
                                     <p className="text-capitalize font-weight-bold mt-3 mb-0"> some info about the product</p>
                                     <p className="text-muted lead">{info}</p>
                                     {/*Buttons*/}
 
-                                    <div >
+                                    <div>
                                         <Link to="/">
                                             <ButtonContainer> Back to product</ButtonContainer>
                                         </Link>
diff --git a/src/components/Modal.js b/src/components/Modal.js
index 7108660..ae29d11 100644
--- a/src/components/Modal.js
+++ b/src/components/Modal.js
@@ -5,7 +5,7 @@ import {ButtonContainer} from "./Button";
 import {Link} from "react-router-dom";
 
 
-export default class Modal extends Component {
+class Modal extends Component {
     render() {
         return (
             <ProductConsumer>
@@ -50,6 +50,8 @@ export default class Modal extends Component {
     }
 }
 
+export default Modal;
+
 const ModalContainer = styled.div`
   position:fixed;
   top:0;
diff --git a/src/components/Product.js b/src/components/Product.js
index 56917cb..07142a4 100644
--- a/src/components/Product.js
+++ b/src/components/Product.js
@@ -3,12 +3,10 @@ import styled from 'styled-components';
 import {Link} from 'react-router-dom';
 import {ProductConsumer} from "../Context";
 import PropTypes from 'prop-types';
-import NumberFormat from 'react-number-format';
 
 export default class Product extends Component {
     render() {
-        const {id, title, img, price, inCart, company} = this.props.product;
-        //var NumberFormat = require('react-number-format');
+        const {id, title, img, price, inCart} = this.props.product;
 
         return (
             <ProductWrapper className="col-9 mx-auto col-md-6 col-lg-3 my-3">
@@ -19,6 +17,7 @@ export default class Product extends Component {
                                 className="img-container p-5"
                                 onClick={()=>{
                                     value.handleDetail(id);
+                                    value.openModal(id)
                                 }}>
                             <Link to="/details">
                                 <img src={img} alt="product" className="card-img-top"/>
@@ -28,8 +27,6 @@ export default class Product extends Component {
                                 disabled={inCart ? true : false}
                                 onClick={()=> {
                                 value.addToCart(id);
-                                    value.openModal(id)
-
                                 }
                                 } >
                                 {inCart ? (<p className="text-capitalize mb-0" disabled>In Cart</p>):(<i className="fa fa-cart-plus" />)}
@@ -41,7 +38,8 @@ export default class Product extends Component {
                     <div className="card-footer d-flex justify-content-between">
                         <p className="align-self-center mb-0">
                             {title}
-                            <br/><strong>{company}</strong>
+<<<<<<< HEAD
+                            <br/><strong className="company-name">{company}</strong>
                             <hr className="py-2 w-auto"></hr>
                             <h5 className="text-blue font-italic mb-0">
                                 {/*<span>${price}</span>*/}
@@ -56,6 +54,11 @@ export default class Product extends Component {
                                     renderText={price => <span>{price}</span>} />
 
                             </h5>
+=======
+<h5 className="text-blue font-italic mb-0">
+    <span className="mr-1">${price}</span>
+</h5>
+>>>>>>> parent of 33ca9fa... Changing products and updates
                         </p>
                     </div>
                 </div>
diff --git a/src/components/ProductList.js b/src/components/ProductList.js
index e8c5d23..96acce2 100644
--- a/src/components/ProductList.js
+++ b/src/components/ProductList.js
@@ -12,7 +12,7 @@ export default class ProductList extends Component{
             <React.Fragment>
                 <div className="py-5">
                     <div className="container">
-                        <Title name="our" title="products"/>
+                        <Title name="OUR PRODUCTS"/>
 
                         <div className="row">
                             <ProductConsumer>
diff --git a/src/data.js b/src/data.js
index ac701b7..16204f4 100644
--- a/src/data.js
+++ b/src/data.js
@@ -3,96 +3,96 @@
 export const storeProducts = [
   {
     id: 1,
-    title: "Cutthroat Carbon GRX600",
-    img: "img/salsa-salsa-cutthroat-carbon-grx600.jpg",
-    price: 3299.00,
-    company: "SALSA",
+    title: "Google Pixel - Black",
+    img: "img/product-1.png",
+    price: 10,
+    company: "GOOGLE",
     info:
-      "Cutthroat is Salsa's Tour Divide-inspired drop bar bike, born on the endless ribbons of mixed surfaces the Great Divide Mountain Bike Route offers.",
+      "Lorem ipsum dolor amet offal butcher quinoa sustainable gastropub, echo park actually green juice sriracha paleo. Brooklyn sriracha semiotics, DIY coloring book mixtape craft beer sartorial hella blue bottle. Tote bag wolf authentic try-hard put a bird on it mumblecore. Unicorn lumbersexual master cleanse blog hella VHS, vaporware sartorial church-key cardigan single-origin coffee lo-fi organic asymmetrical. Taxidermy semiotics celiac stumptown scenester normcore, ethical helvetica photo booth gentrify.",
     inCart: false,
     count: 0,
     total: 0
   },
   {
     id: 2,
-    title: "Fargo Apex 1",
-    img: "img/salsa-salsa-fargo-apex-1-now-available.jpg",
-    price: 2199.00,
-    company: "SALSA",
+    title: "Samsung S7",
+    img: "img/product-2.png",
+    price: 16,
+    company: "SAMSUNG",
     info:
-      "Call for Availability// Fargo is Salsa's drop bar, off-road adventure bike, designed to take you wherever it is you wish to go.",
+      "Lorem ipsum dolor amet offal butcher quinoa sustainable gastropub, echo park actually green juice sriracha paleo. Brooklyn sriracha semiotics, DIY coloring book mixtape craft beer sartorial hella blue bottle. Tote bag wolf authentic try-hard put a bird on it mumblecore. Unicorn lumbersexual master cleanse blog hella VHS, vaporware sartorial church-key cardigan single-origin coffee lo-fi organic asymmetrical. Taxidermy semiotics celiac stumptown scenester normcore, ethical helvetica photo booth gentrify.",
     inCart: false,
     count: 0,
     total: 0
   },
   {
     id: 3,
-    title: "Roubaix Expert UDI2",
-    img: "img/specialized-specialized-roubaix-expert-udi2.jpg",
-    price: 6000.00,
-    company: "Specialized",
+    title: "HTC 10 - Black",
+    img: "img/product-3.png",
+    price: 8,
+    company: "htc",
     info:
-      "With six wins at Paris-Roubaix, our Roubaix has proven that Smoother is Faster. Until this moment, however, smooth has admittedly come with some compromises.",
+      "Lorem ipsum dolor amet offal butcher quinoa sustainable gastropub, echo park actually green juice sriracha paleo. Brooklyn sriracha semiotics, DIY coloring book mixtape craft beer sartorial hella blue bottle. Tote bag wolf authentic try-hard put a bird on it mumblecore. Unicorn lumbersexual master cleanse blog hella VHS, vaporware sartorial church-key cardigan single-origin coffee lo-fi organic asymmetrical. Taxidermy semiotics celiac stumptown scenester normcore, ethical helvetica photo booth gentrify.",
     inCart: false,
     count: 0,
     total: 0
   },
   {
     id: 4,
-    title: "S-WORKS VENGE DISC SRAM ETAP",
-    img: "img/specialized-s-works-venge-disc-sram-etap-gloss-met.jpg",
-    price: 12520.00,
-    company: "Specialized",
+    title: "HTC 10 - White",
+    img: "img/product-4.png",
+    price: 18,
+    company: "htc",
     info:
-      "TOP OF THE LINE ROAD RIDING.",
+      "Lorem ipsum dolor amet offal butcher quinoa sustainable gastropub, echo park actually green juice sriracha paleo. Brooklyn sriracha semiotics, DIY coloring book mixtape craft beer sartorial hella blue bottle. Tote bag wolf authentic try-hard put a bird on it mumblecore. Unicorn lumbersexual master cleanse blog hella VHS, vaporware sartorial church-key cardigan single-origin coffee lo-fi organic asymmetrical. Taxidermy semiotics celiac stumptown scenester normcore, ethical helvetica photo booth gentrify.",
     inCart: false,
     count: 0,
     total: 0
   },
   {
     id: 5,
-    title: "Horsethief Carbon XTR Bike",
-    img: "img/salsa-salsa-horsethief-carbon-xtr-bike-29-carbon-y.jpg",
-    price: 7099.00,
-    company: "SALSA",
+    title: "HTC Desire 626s",
+    img: "img/product-5.png",
+    price: 24,
+    company: "htc",
     info:
-    "Horsethief is one bike for many trails.",
+      "Lorem ipsum dolor amet offal butcher quinoa sustainable gastropub, echo park actually green juice sriracha paleo. Brooklyn sriracha semiotics, DIY coloring book mixtape craft beer sartorial hella blue bottle. Tote bag wolf authentic try-hard put a bird on it mumblecore. Unicorn lumbersexual master cleanse blog hella VHS, vaporware sartorial church-key cardigan single-origin coffee lo-fi organic asymmetrical. Taxidermy semiotics celiac stumptown scenester normcore, ethical helvetica photo booth gentrify.",
     inCart: false,
     count: 0,
     total: 0
   },
   {
     id: 6,
-    title: " Rustler Carbon XTR Bike",
-    img: "img/salsa-salsa-rustler-carbon-xtr-bike-275-carbon-ora.jpg",
-    price: 7099.00,
-    company: "SALSA",
+    title: "Vintage Iphone",
+    img: "img/product-6.png",
+    price: 17,
+    company: "apple",
     info:
-      "Salsa’s playful and dynamic technical trail bike.",
+      "Lorem ipsum dolor amet offal butcher quinoa sustainable gastropub, echo park actually green juice sriracha paleo. Brooklyn sriracha semiotics, DIY coloring book mixtape craft beer sartorial hella blue bottle. Tote bag wolf authentic try-hard put a bird on it mumblecore. Unicorn lumbersexual master cleanse blog hella VHS, vaporware sartorial church-key cardigan single-origin coffee lo-fi organic asymmetrical. Taxidermy semiotics celiac stumptown scenester normcore, ethical helvetica photo booth gentrify.",
     inCart: false,
     count: 0,
     total: 0
   },
   {
     id: 7,
-    title: "Cutthroat GRX 810 1x\n",
-    img: "img/salsa-salsa-cutthroat-grx-810-1x.jpg",
-    price: 4199.00,
-    company: "SALSA",
+    title: "Iphone 7",
+    img: "img/product-7.png",
+    price: 30,
+    company: "apple",
     info:
-      "Cutthroat is Salsa's Tour Divide-inspired drop bar bike, born on the endless ribbons of mixed surfaces the Great Divide Mountain Bike Route offers.",
+      "Lorem ipsum dolor amet offal butcher quinoa sustainable gastropub, echo park actually green juice sriracha paleo. Brooklyn sriracha semiotics, DIY coloring book mixtape craft beer sartorial hella blue bottle. Tote bag wolf authentic try-hard put a bird on it mumblecore. Unicorn lumbersexual master cleanse blog hella VHS, vaporware sartorial church-key cardigan single-origin coffee lo-fi organic asymmetrical. Taxidermy semiotics celiac stumptown scenester normcore, ethical helvetica photo booth gentrify.",
     inCart: false,
     count: 0,
     total: 0
   },
   {
     id: 8,
-    title: "Roubaix Sport",
-    img: "img/specialized-specialized-roubaix-sport.jpg",
-    price: 2900.00,
-    company: "Specialized",
+    title: "Smashed Iphone",
+    img: "img/product-8.png",
+    price: 2,
+    company: "apple",
     info:
-    "With six wins at Paris-Roubaix, our Roubaix has proven that Smoother is Faster. Until this moment, however, smooth has admittedly come with some compromises.",
+      "Lorem ipsum dolor amet offal butcher quinoa sustainable gastropub, echo park actually green juice sriracha paleo. Brooklyn sriracha semiotics, DIY coloring book mixtape craft beer sartorial hella blue bottle. Tote bag wolf authentic try-hard put a bird on it mumblecore. Unicorn lumbersexual master cleanse blog hella VHS, vaporware sartorial church-key cardigan single-origin coffee lo-fi organic asymmetrical. Taxidermy semiotics celiac stumptown scenester normcore, ethical helvetica photo booth gentrify.",
     inCart: false,
     count: 0,
     total: 0
@@ -101,8 +101,8 @@ export const storeProducts = [
 
 export const detailProduct = {
   id: 1,
-  title: "Specialized Roubaix Sport\n",
-  img: "img/specialized-specialized-roubaix-sport.jpg",
+  title: "Google Pixel - Black",
+  img: "img/product-1.png",
   price: 10,
   company: "google",
   info: