conflict resolution
Merge branch 'master' of https://github.com/ztm4589/WarehouseTracker.git