Separate formula conflicts from requirements

In preparation for moving deps to SoftwareSpec (to facilitate declaring them inside of `devel` and `head` blocks), conflicts need to be separated since they are a property of the formula and not any individual spec.