fixup: s/bad/conflicting