Fixed the merge resolve