Rapid Conflict Resolution