Inventory model added
new files solved conflict