commit checkout
fix conflict
edit cart.tpl