more merge resolves