conflict resolution, simplified

Get in touch with Tammy