change fill color for head
change print
group by shipment
fix merge conflic