Working on inventory comparison
Merge branch 'tngyn-branch'
Trying to fix conflicts
Merge branch 'tngyn-branch'
Fixed merge conflict