fix stripes, fix merge