handle Merge Conflicts
Shopping Cart modification
merge weirdmess