cart totals
fix conflicts