Merge Resolving