I did some zipping and zip starring
Fixed merge conflit