adding items already on an order increments the existing one
Merge origin/master