added more trips and cartages
added shipment
start over seeds
resolve merge
fix error when server validation is shown
fix error in show