Better conflicts support

Validations and actions handled similarly to options now