Fixed merge conflict and added ability for supermarket to add/edit inventory