More merge improvements