fixing bad merge error... an unnecessary if statement in _cart.html.haml