Merge Resolver

Branch created to resolve conflicts.