More config file utils

Also adds support for conflicts in the dsl.