Onyx Spec Conflict Overrides

No longer exists.

Go back to Onyx spec.