Merge conflict corrected again and re-added my changes to supermarketSys