add login info to cart
merge
merging with cart
minor stuff
resolve merge conflict