Given that potential faults due to conflicts are diagnosable and readily repairable, what is needed in the art is a system and method for automatically correcting hardware/software conflicts that have potential for causing a fault, preferably well before they actually become faults.