Resolve the conflict for the classification.php