fix rebase

_/items.json

@@ -413,12 +413,6 @@
   "chest": {
     "id": 54
   },
-<<<<<<< HEAD
-  "redstone_wire": {
-    "id": 55
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "diamond_ore": {
     "id": 56
   },
@@ -428,27 +422,12 @@
   "crafting_table": {
     "id": 58
   },
-<<<<<<< HEAD
-  "wheat": {
-    "id": 59
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "farmland": {
     "id": 60
   },
   "furnace": {
     "id": 61
   },
-<<<<<<< HEAD
-  "sign": {
-    "id": 63
-  },
-  "oak_door": {
-    "id": 64
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "ladder": {
     "id": 65
   },
@@ -464,12 +443,6 @@
   "stone_pressure_plate": {
     "id": 70
   },
-<<<<<<< HEAD
-  "iron_door": {
-    "id": 71
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "oak_pressure_plate": {
     "id": 72
   },
@@ -497,12 +470,6 @@
   "clay": {
     "id": 82
   },
-<<<<<<< HEAD
-  "sugar_cane": {
-    "id": 83
-  },
-=======
->>>>>>> 7194ff2 (fix some item ids)
   "jukebox": {
     "id": 84
   },