diff --git a/css/shop.css b/css/shop.css
index 4aaa972..eabc8e2 100644
--- a/css/shop.css
+++ b/css/shop.css
@@ -1,3 +1,4 @@
+@import url('https://fonts.googleapis.com/css?family=Poppins:200,300,400,500,600,700,800,900&display=swap');
 *{
   margin: 0;
   padding: 0;
diff --git a/js/shop.js b/js/shop.js
index 40e8d4b..2819c8a 100644
--- a/js/shop.js
+++ b/js/shop.js
@@ -15,11 +15,8 @@ function c(x){
 // Load
 function load(){
   items = JSON.parse(localStorage.getItem('items'));
-<<<<<<< HEAD:js/shop.js
+
   cs = items.dogs + items.cats*12 + items.foxes*18 + items.wolfs*100 + items.hamsters*130 + items.whales*220 + items.capybaras*280 + items.platapuses*400 + items.porcupines*650 + items.hippos*950 + items.snakes*1000 + items.cheetahs*3000 + items.pythons*7800 + items.girrafes*8400;
-=======
-  cs = items.dogs + items.cats*12 + items.foxes*18 + items.wolfs*100 + items.hamsters*130 + items.whales*220 + items.capybaras*280 + items.platapuses*400 + items.porcupines*650 + items.hippos*950 + items.snakes*1000 + items.cheetahs*3000;
->>>>>>> side:shop.js
 
   if(items.lang == 1){
     document.documentElement.setAttribute('lang', 'en');
diff --git a/shop.html b/shop.html
index cef4bbd..0ef39fd 100644
--- a/shop.html
+++ b/shop.html
@@ -390,8 +390,8 @@
     <ul>
         <li><a href="index.html" id="brb">BRB</a></li>
         <li><a href="upgrade.html" id="upg">Upgrades</a></li>
-        <li onclick="reset()"><a id="del">RESET</a></li>
-        <li onclick="help()"><a id="sos">???</a></li>
+        <li style="display: none;" onclick="reset()"><a id="del">RESET</a></li>
+        <li style="display: none;" onclick="help()"><a id="sos">???</a></li>
         <li style="display: none;" onclick="LDmodes()"><a id="modes">Dark Mode</a></li>
     </ul>
   </div>