conflict resolution, simplified