yet more merge testing