Managing Conflict Resolution