Resolved Merge Conflicts v2