Resolved Merge conflicts