merge resolve