More merge testing