[CHORES] resolve conflict with staging

src/App.js

src/components/CardKatalog/CardKatalog.css

src/components/CardKatalog/CardKatalog.js

src/components/CardKatalog/CardKatalog.test.js

src/components/Home/Home.js

src/components/KeranjangButton/KeranjangButton.css

src/components/KeranjangButton/KeranjangButton.js

src/components/KeranjangButton/KeranjangButton.test.js

src/components/KeranjangButton/keranjang-icon.svg

src/hocs/Layout.js

src/page/HomepageSuplier/HomepageSuplier.css

src/page/HomepageSuplier/HomepageSuplier.js

src/page/HomepageSuplier/HomepageSuplier.test.js

src/page/HomepageSuplier/daftar-pesanan.svg

src/page/KatalogProdukMitra/KatalogProdukMitra.css

src/page/KatalogProdukMitra/KatalogProdukMitra.js

src/page/KatalogProdukMitra/KatalogProdukMitra.test.js

src/page/Keranjang/Keranjang.css

src/page/Keranjang/Keranjang.js

src/page/Keranjang/Keranjang.test.js