working on cart
removed conflict in home file
refactor cart code