Merge Resolved