Prefer the requesting inventory when adding!
Merge branch 'origin/master'