more merger fixes