merge & data parallel & fixes