add cart and address page
resolve merge conflicts