Conflict solve