add support for specifying conflicts