commit
fixed total price
fixed merge conflict