Resolved Merge