text-align right on cart total, cart show.
resolved merge conflict