Minor
Conflict solve