added cargo price to transaction
added cargo price to transaction
fix merge conflict