item management done
items/edit.js and items/update.js file deleted
conflict removed'