diff --git a/js/items.json b/js/items.json
index 06b97d1..db64c7c 100644
--- a/js/items.json
+++ b/js/items.json
@@ -170,6 +170,7 @@
   }, {
     "id": 42,
     "name": "glass",
+<<<<<<< HEAD
     "value": 100
   }, {
     "id": 43,
@@ -195,6 +196,9 @@
     "id": 48,
     "name": "bottleapplevenegar",
     "value": 100
+=======
+    "value": 120
+>>>>>>> bd0f8129c4cb654727664b0b7078fc2ee1ec72d8
   }],
   "minerals": {
     "nameFromId": ["bauxite",