Resolved Merge Conflict