more merge tests