Merge resolve