Update Merge

You can edit Item.java now