fix a minor (not a functional) conflict
Merge branch 'quantity'
Done with quantity changes, for now