more merge resolve