removes item if quantity is 0
resolves merge conflict