Merge resolve
Merge resolve